diff --git a/public/v2/apps/filestash.json b/public/v2/apps/filestash.json
new file mode 100644
index 0000000..5801c23
--- /dev/null
+++ b/public/v2/apps/filestash.json
@@ -0,0 +1,30 @@
+{
+    "captainVersion": "2",
+    "documentation": "Filestash https://www.filestash.app",
+    "description": "A modern web client for SFTP, S3, FTP, WebDAV, Git, Minio, LDAP, CalDAV, CardDAV, Mysql, Backblaze, ...",
+    "displayName": "Filestash",
+    "dockerCompose": {
+        "version": "3.3",
+        "services": {
+            "$$cap_appname": {
+                "image": "machines/filestash:$$cap_filestash_version",
+                "containerHttpPort": "8334",
+                "volumes": [
+                    "$$cap_appname-app-data-state:/app/data/state"
+                ],
+                "restart": "always"
+            }
+        }
+    },
+    "instructions": {
+        "start": "Filestash is a modern web client for SFTP, S3, FTP, WebDAV, Git, Minio, LDAP, CalDAV, CardDAV, Mysql, Backblaze, ...",
+        "end": "Filestash is deployed and available as srv-captain--$$cap_appname-db:8334 to other apps."
+    },
+    "variables": [{
+            "id": "$$cap_filestash_version",
+            "label": "Filestash Version",
+            "defaultValue": "b7b45f2",
+            "description": "Check out their Docker page for the valid tags https://hub.docker.com/r/machines/filestash/tags"
+        }
+    ]
+}
diff --git a/public/v2/logos/filestash.png b/public/v2/logos/filestash.png
new file mode 100644
index 0000000..5db95f2
Binary files /dev/null and b/public/v2/logos/filestash.png differ