diff --git a/blueprints/focalboard/docker-compose.yml b/blueprints/focalboard/docker-compose.yml
new file mode 100644
index 00000000..edc68cba
--- /dev/null
+++ b/blueprints/focalboard/docker-compose.yml
@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+  focalboard:
+    image: mattermost/focalboard:7.11.4
+    container_name: focalboard
+    restart: unless-stopped
+    volumes:
+      - focalboardData:/opt/focalboard/data
+    environment:
+      - VIRTUAL_HOST
+      - VIRTUAL_PORT
+      - DB_TYPE
+      - DB_CONFIG=postgres://${POSTGRES_USER}:${POSTGRES_password}@postgres:5432/${postgres_db}?sslmode=disable
+
+  postgres:
+    image: postgres:17
+    environment:
+      - POSTGRES_USER
+      - POSTGRES_PASSWORD
+      - POSTGRES_DB
+    volumes:
+      - ./postgres_data:/var/lib/postgresql/data
+
+volumes:
+  focalboardData:
+    driver: local
+  focalboardPostgre:
+    driver: local
\ No newline at end of file
diff --git a/blueprints/focalboard/focalboard.png b/blueprints/focalboard/focalboard.png
new file mode 100644
index 00000000..75b6e5be
Binary files /dev/null and b/blueprints/focalboard/focalboard.png differ
diff --git a/blueprints/focalboard/template.toml b/blueprints/focalboard/template.toml
new file mode 100644
index 00000000..8cf82564
--- /dev/null
+++ b/blueprints/focalboard/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = [
+      "VIRTUAL_HOST=${main_domain}",
+      "VIRTUAL_PORT=8000 # Do Not Alter",
+      "DB_TYPE=postgres",
+      "POSTGRES_USER=focalboard",
+      "POSTGRES_PASSWORD=password",
+      "POSTGRES_DB=focalboard"
+    ]
+mounts = []
+
+[[config.domains]]
+serviceName = "focalboard"
+port = 8000
+host = "${main_domain}"
diff --git a/blueprints/forgejo/docker-compose.yml b/blueprints/forgejo/docker-compose.yml
index 9e0a0e74..36733c6e 100644
--- a/blueprints/forgejo/docker-compose.yml
+++ b/blueprints/forgejo/docker-compose.yml
@@ -32,4 +32,6 @@ services:
 
 volumes:
   forgejo_db:
-  forgejo_server:
\ No newline at end of file
+    driver: local
+  forgejo_server:
+    driver: local
\ No newline at end of file
diff --git a/meta.json b/meta.json
index 6c1d9b35..508e2775 100644
--- a/meta.json
+++ b/meta.json
@@ -697,6 +697,20 @@
       "storage"
     ]
   },
+  {
+    "id": "focalboard",
+    "name": "Focalboard",
+    "version": "8.0.0",
+    "description": "Open source project management for technical teams",
+    "logo": "focalboard.png",
+    "links": {
+      "github": "https://github.com/sysblok/focalboard",
+      "website": "https://focalboard.com"
+    },
+    "tags": [
+      "kanban"
+    ]
+  },
   {
     "id": "tolgee",
     "name": "Tolgee",