diff --git a/blueprints/fmd-server/docker-compose.yml b/blueprints/fmd-server/docker-compose.yml
new file mode 100644
index 00000000..85bf5876
--- /dev/null
+++ b/blueprints/fmd-server/docker-compose.yml
@@ -0,0 +1,30 @@
+services:
+  fmd-server:
+    image: registry.gitlab.com/fmd-foss/fmd-server:v0.11.0
+    ports:
+     - 8080
+    environment:
+      # View all configurations at:
+      #     - https://gitlab.com/fmd-foss/fmd-server/-/blob/master/config.example.yml
+      #
+      # Config fields can be converted to environment variables as per the documentation
+      #     - https://gitlab.com/fmd-foss/fmd-server#via-environment-variables
+      # e.g. RegistrationToken -> FMD_REGISTRATIONTOKEN
+      #
+      - FMD_REGISTRATIONTOKEN=${FMD_REGISTRATIONTOKEN}
+      - FMD_USERIDLENGTH=${FMD_USERIDLENGTH}
+      - FMD_MAXSAVEDLOC=${FMD_MAXSAVEDLOC}
+      - FMD_MAXSAVEDPIC=${FMD_MAXSAVEDPIC}
+    volumes:
+      - fmd-server-data:/var/lib/fmd-server/db/
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8080'"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
+      start_interval: 3s
+
+volumes:
+  fmd-server-data:
diff --git a/blueprints/fmd-server/fmd-server.svg b/blueprints/fmd-server/fmd-server.svg
new file mode 100644
index 00000000..d4366ab4
--- /dev/null
+++ b/blueprints/fmd-server/fmd-server.svg
@@ -0,0 +1,9 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" fill="transparent" stroke-width="5" width="452px">
+	<ellipse cx="50" cy="86" rx="40" ry="9" stroke="#318f2f" />
+	<g stroke="#4cb050" stroke-linejoin="round">
+		<path d="M50, 75 l-20, -20 a27, 27 0 1 1 40, 0 l-20, 20 z" stroke-width="15"  />
+		<path d="M50, 82 l-25, -25 a32.5, 32.5 0 1 1 50, 0 l-25, 25 z" stroke="#318f2f" />
+
+		<circle cx="50" cy="36" r="8" />
+	</g>
+</svg>
\ No newline at end of file
diff --git a/blueprints/fmd-server/template.toml b/blueprints/fmd-server/template.toml
new file mode 100644
index 00000000..6ba84436
--- /dev/null
+++ b/blueprints/fmd-server/template.toml
@@ -0,0 +1,14 @@
+[variables]
+main_domain = "${domain}"
+registration_token = "${password:32}"
+
+[[config.domains]]
+serviceName = "fmd-server"
+port = 8080
+host = "${main_domain}"
+
+[config.env]
+FMD_REGISTRATIONTOKEN = "${registration_token}"
+FMD_USERIDLENGTH=5
+FMD_MAXSAVEDLOC=1000
+FMD_MAXSAVEDPIC=10
diff --git a/meta.json b/meta.json
index e421d73d..51e72251 100644
--- a/meta.json
+++ b/meta.json
@@ -2004,6 +2004,24 @@
       "automation"
     ]
   },
+  {
+    "id": "fmd-server",
+    "name": "FMD Server",
+    "version": "0.11.0",
+    "description": "A server to communicate with the FMD Android app, to locate and control your devices.",
+    "logo": "fmd-server.svg",
+    "links": {
+      "github": "https://gitlab.com/fmd-foss/fmd-server",
+      "website": "https://fmd-foss.org",
+      "docs": "https://fmd-foss.org/docs/fmd-server/overview"
+    },
+    "tags": [
+      "phone",
+      "security",
+      "gps",
+      "location"
+    ]
+  },
   {
     "id": "focalboard",
     "name": "Focalboard",