diff --git a/blueprints/filestash/docker-compose.yml b/blueprints/filestash/docker-compose.yml
new file mode 100644
index 00000000..ddaf091a
--- /dev/null
+++ b/blueprints/filestash/docker-compose.yml
@@ -0,0 +1,38 @@
+version: '3.8'
+
+services:
+  app:
+    container_name: filestash
+    image: machines/filestash:latest
+    restart: always
+    environment:
+      - APPLICATION_URL=${APPLICATION_URL}
+      - CANARY=${CANARY}
+      - OFFICE_URL=${OFFICE_URL}
+      - OFFICE_FILESTASH_URL=${OFFICE_FILESTASH_URL}
+      - OFFICE_REWRITE_URL=${OFFICE_REWRITE_URL}
+    ports:
+      - 8334
+    volumes:
+      - filestash:/app/data/state/
+
+  wopi_server:
+    container_name: filestash_wopi
+    image: collabora/code:24.04.10.2.1
+    restart: always
+    environment:
+      # Set below to "true" if you are using custom domain and want to enable SSL
+      - extra_params=--o:ssl.enable=false
+      - aliasgroup1=https://.*:443
+    command:
+      - /bin/bash
+      - -c
+      - |
+          curl -o /usr/share/coolwsd/browser/dist/branding-desktop.css https://gist.githubusercontent.com/mickael-kerjean/bc1f57cd312cf04731d30185cc4e7ba2/raw/d706dcdf23c21441e5af289d871b33defc2770ea/destop.css
+          /bin/su -s /bin/bash -c '/start-collabora-online.sh' cool
+    user: root
+    ports:
+      - 9980
+
+volumes:
+  filestash:
\ No newline at end of file
diff --git a/blueprints/filestash/filestash.svg b/blueprints/filestash/filestash.svg
new file mode 100644
index 00000000..da38b7d7
--- /dev/null
+++ b/blueprints/filestash/filestash.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500" aria-hidden="true" id="logo">
+  <path d="m 249.81902,82.02209 c -60.92742,0.008 -110.36509,49.42061 -110.54451,110.48945 0.19165,-0.008 0.38331,-0.0145 0.575,-0.0214 62.9966,-0.55895 110.26862,56.10327 111.21972,101.77446 -1.36113,-46.51892 48.80548,-100.95619 109.297,-101.72553 C 360.20192,131.45827 310.75797,82.02801 249.81867,82.02209 Z m 110.54758,110.51698 0.01,0.29973 c -76.55325,3.46637 -109.86187,68.00462 -109.54421,101.19597 0.60821,63.54878 -33.23628,119.47914 -116.41793,119.82812 l 227.35682,-0.84967 c 61.06068,6.4e-4 110.56033,-48.50673 110.55982,-109.70943 -10e-4,-61.20148 -49.50035,-110.81428 -110.55982,-110.81365 -0.46806,0.0129 -0.93601,0.0296 -1.40387,0.0489 z M 250.74065,294.038 C 249.16401,250.29395 208.4383,193.24696 139.25922,192.8388 l 0.0153,-0.32726 C 78.448085,192.828 29.301862,242.33505 29.289759,303.30379 29.289241,364.50647 78.23614,414.07363 133.81565,413.84368 232.42029,413.43571 252.31728,337.78206 250.74065,294.038 Z"
+        style="fill:#00000000;stroke:#f2f3f5;stroke-width:35;" />
+</svg>
diff --git a/blueprints/filestash/template.toml b/blueprints/filestash/template.toml
new file mode 100644
index 00000000..3d99114f
--- /dev/null
+++ b/blueprints/filestash/template.toml
@@ -0,0 +1,14 @@
+[variables]
+main_domain = "${domain}"
+
+[[config.domains]]
+serviceName = "app"
+port = 8334
+host = "${main_domain}"
+
+[config.env]
+APPLICATION_URL = "${main_domain}"
+CANARY = "true"
+OFFICE_URL = "http://wopi_server:9980"
+OFFICE_FILESTASH_URL = "http://app:8334"
+OFFICE_REWRITE_URL = "http://127.0.0.1:9980"
\ No newline at end of file
diff --git a/meta.json b/meta.json
index 89507966..71d86643 100644
--- a/meta.json
+++ b/meta.json
@@ -2667,5 +2667,22 @@
       "saml",
       "multi-tenant"
     ]
+  },
+  {
+    "id": "filestash",
+    "name": "Filestash",
+    "version": "latest",
+    "description": "Filestash is the enterprise-grade file manager connecting your storage with your identity provider and authorisations.",
+    "logo": "filestash.svg",
+    "links": {
+      "github": "https://github.com/mickael-kerjean/filestash",
+      "website": "https://www.filestash.app/",
+      "docs": "https://www.filestash.app/docs/"
+    },
+    "tags": [
+      "file-manager",
+      "document-editor",
+      "self-hosted"
+    ]
   }
 ]