diff --git a/Apps/Stash/appfile.json b/Apps/Stash/appfile.json
new file mode 100644
index 000000000..48b6bcdae
--- /dev/null
+++ b/Apps/Stash/appfile.json
@@ -0,0 +1,226 @@
+{
+  "host": "",
+  "protocol": "http",
+  "port_map": "9999",
+  "cpu_shares": 50,
+  "restart": "unless-stopped",
+  "label": "Stash",
+  "position": false,
+  "index": "",
+  "icon": "https://avatars.githubusercontent.com/u/24867479",
+  "network_model": "bridge",
+  "image": "stashapp/stash:v0.21.0",
+  "description": "Stash allows you to organize and view your own collection of adult video and image files. Think of it like a private PornHub site for your personal porn collection. Documentation: https://docs.stashapp.cc",
+  "origin": "custom",
+  "ports": [
+    {
+      "container": "9999",
+      "host": "9999",
+      "protocol": "tcp",
+      "desc": "WebUI Port",
+      "type": 0
+    }
+  ],
+  "volumes": [
+    {
+      "container": "/backups",
+      "host": "/DATA/AppData/Stash/backups",
+      "type": 0,
+      "desc": "Backups"
+    },
+    {
+      "container": "/blobs",
+      "host": "/DATA/AppData/Stash/blobs",
+      "type": 0,
+      "desc": "Blobs"
+    },
+    {
+      "container": "/cache",
+      "host": "/DATA/AppData/Stash/cache",
+      "type": 0,
+      "desc": "Cache"
+    },
+    {
+      "container": "/config",
+      "host": "/DATA/AppData/Stash/config",
+      "type": 0,
+      "desc": "config"
+    },
+    {
+      "container": "/custom_performers",
+      "host": "/DATA/AppData/Stash/custom_performers",
+      "type": 0,
+      "desc": "custom_performers"
+    },
+    {
+      "container": "/data",
+      "host": "/DATA/AppData/Stash/data",
+      "type": 0,
+      "desc": "data"
+    },
+    {
+      "container": "/media",
+      "host": "/DATA/Media/xxx",
+      "type": 0,
+      "desc": "media"
+    },
+    {
+      "container": "/generated",
+      "host": "/DATA/AppData/Stash/generated",
+      "type": 0,
+      "desc": "Generated files"
+    },
+    {
+      "container": "/logs",
+      "host": "/DATA/AppData/Stash/logs",
+      "type": 0,
+      "desc": "Logs"
+    },
+    {
+      "container": "/metadata",
+      "host": "/DATA/AppData/Stash/metadata",
+      "type": 0,
+      "desc": "Metadata"
+    },
+    {
+      "container": "/plugins",
+      "host": "/DATA/AppData/Stash/plugins",
+      "type": 0,
+      "desc": "Plugins"
+    },
+    {
+      "container": "/scrapers",
+      "host": "/DATA/AppData/Stash/scrapers",
+      "type": 0,
+      "desc": "Scrapers"
+    },
+    {
+      "container": "/templates",
+      "host": "/DATA/AppData/Stash/templates",
+      "type": 0,
+      "desc": "Templates"
+    },
+    {
+      "container": "/themes",
+      "host": "/DATA/AppData/Stash/themes",
+      "type": 0,
+      "desc": "Themes"
+    },
+    {
+      "container": "/userscripts",
+      "host": "/DATA/AppData/Stash/userscripts",
+      "type": 0,
+      "desc": "Userscripts"
+    },
+    {
+      "container": "/validator",
+      "host": "/DATA/AppData/Stash/validator",
+      "type": 0,
+      "desc": "Validators"
+    }
+  ],
+  "envs": [
+    {
+      "container": "TZ",
+      "host": "Etc/UTC",
+      "desc": "",
+      "type": 0
+    },
+    {
+      "container": "STASH_STASH",
+      "host": "/data/",
+      "desc": "Stash Stash",
+      "type": 0
+    },
+    {
+      "container": "STASH_GENERATED",
+      "host": "/generated/",
+      "desc": "Stash Generated",
+      "type": 0
+    },
+    {
+      "container": "STASH_METADATA",
+      "host": "/metadata/",
+      "desc": "Stash Metadata",
+      "type": 0
+    },
+    {
+      "container": "STASH_CACHE",
+      "host": "/cache/",
+      "desc": "Stash Cache",
+      "type": 0
+    },
+    {
+      "container": "STASH_PLUGINS",
+      "host": "/plugins/",
+      "desc": "Stash Plugins",
+      "type": 0
+    },
+    {
+      "container": "STASH_THEMES",
+      "host": "/themes/",
+      "desc": "Stash Themes",
+      "type": 0
+    },
+    {
+      "container": "STASH_USERSCRIPTS",
+      "host": "/userscripts/",
+      "desc": "Stash Userscripts",
+      "type": 0
+    },
+    {
+      "container": "STASH_VALIDATOR",
+      "host": "/validator/",
+      "desc": "Stash Validator",
+      "type": 0
+    },
+    {
+      "container": "STASH_SCRAPERS",
+      "host": "/scrapers/",
+      "desc": "Stash Scrapers",
+      "type": 0
+    },
+    {
+      "container": "STASH_TEMPLATES",
+      "host": "/templates/",
+      "desc": "Stash Templates",
+      "type": 0
+    },
+    {
+      "container": "STASH_CONFIG_FILE",
+      "host": "/config/config.yml",
+      "desc": "Stash Config File",
+      "type": 0
+    },
+    {
+      "container": "STASH_BACKUPS",
+      "host": "/backups/",
+      "desc": "Stash Backups",
+      "type": 0
+    },
+    {
+      "container": "STASH_CUSTOM_PERFORMERS",
+      "host": "/custom_performers/",
+      "desc": "Stash Custom Performers",
+      "type": 0
+    },
+    {
+      "container": "STASH_LOG_FILE",
+      "host": "/logs/stash.log",
+      "desc": "Stash Log File",
+      "type": 0
+    }
+  ],
+  "devices": [],
+  "cap_add": [],
+  "cmd": [
+    "stash"
+  ],
+  "privileged": false,
+  "host_name": "Stash",
+  "container_name": "Stash",
+  "appstore_id": 0,
+  "custom_id": "c59788af-cb1a-4a17-82fa-13582b326108",
+  "enable_upnp": false,
+  "version": "1.0"
+}
\ No newline at end of file
diff --git a/Apps/Stash/docker-compose.yml b/Apps/Stash/docker-compose.yml
new file mode 100644
index 000000000..04a987088
--- /dev/null
+++ b/Apps/Stash/docker-compose.yml
@@ -0,0 +1,124 @@
+---
+name: stash
+services:
+  app:
+    image: stashapp/stash:v0.21.0
+    restart: unless-stopped
+    environment:
+      - TZ=$TZ
+      - STASH_STASH=/data/
+      - STASH_GENERATED=/generated/
+      - STASH_BLOBS=/blobs/
+      - STASH_METADATA=/metadata/
+      - STASH_CACHE=/cache/
+      - STASH_PLUGINS=/plugins/
+      - STASH_THEMES=/themes/
+      - STASH_USERSCRIPTS=/userscripts/
+      - STASH_VALIDATOR=/validator/
+      - STASH_SCRAPERS=/scrapers/
+      - STASH_TEMPLATES=/templates/
+      - STASH_CUSTOM_PERFORMERS=/custom_performers/
+      - STASH_BACKUPS=/backups/
+      - STASH_CONFIG_FILE=/config/config.yml
+      - STASH_LOG_FILE=/logs/stash.log
+    x-casaos:
+      envs:
+        - container: STASH_STASH
+          description:
+            en_us: Stash Stash
+        - container: STASH_GENERATED
+          description:
+            en_us: Stash Generated
+        - container: STASH_METADATA
+          description:
+            en_us: Stash Metadata
+        - container: STASH_BLOBS
+          description:
+            en_us: Stash Blobs
+        - container: STASH_CACHE
+          description:
+            en_us: Stash Cache
+        - container: STASH_PLUGINS
+          description:
+            en_us: Stash Plugins
+        - container: STASH_THEMES
+          description:
+            en_us: Stash Themes
+        - container: STASH_USERSCRIPTS
+          description:
+            en_us: Stash Userscripts
+        - container: STASH_VALIDATOR
+          description:
+            en_us: Stash Validator
+        - container: STASH_SCRAPERS
+          description:
+            en_us: Stash Scrapers
+        - container: STASH_TEMPLATES
+          description:
+            en_us: Stash Templates
+        - container: STASH_CUSTOM_PERFORMERS
+          description:
+            en_us: Stash Custom Performers
+        - container: STASH_BACKUPS
+          description:
+            en_us: Stash Backups
+        - container: STASH_CONFIG_FILE
+          description:
+            en_us: Stash Config File
+        - container: STASH_LOG_FILE
+          description:
+            en_us: Stash Log File
+      volumes:
+        - container: /data
+          description:
+            en_us: Stash Stash
+        - container: /media
+          description:
+            en_us: Stash Media
+      ports:
+        - container: "9999"
+          host: "9999"
+          description:
+            en_us: Stash Web Port
+    ports:
+      - 9999:9999
+    volumes:
+      - /DATA/AppData/$AppID/backups:/backups
+      - /DATA/AppData/$AppID/blobs:/blobs
+      - /DATA/AppData/$AppID/cache:/cache
+      - /DATA/AppData/$AppID/config:/config
+      - /DATA/AppData/$AppID/custom_performers:/custom_performers
+      - /DATA/AppData/$AppID/data:/data
+      - /DATA/AppData/$AppID/generated:/generated
+      - /DATA/AppData/$AppID/logs:/logs
+      - /DATA/AppData/$AppID/metadata:/metadata
+      - /DATA/AppData/$AppID/plugins:/plugins
+      - /DATA/AppData/$AppID/scrapers:/scrapers
+      - /DATA/AppData/$AppID/templates:/templates
+      - /DATA/AppData/$AppID/themes:/themes
+      - /DATA/AppData/$AppID/userscripts:/userscripts
+      - /DATA/AppData/$AppID/validator:/validator
+      - /DATA/Media/xxx:/media
+x-casaos:
+  architectures:
+    - amd64
+    - arm
+    - arm64
+  main: app
+  author: f4bio
+  description:
+    en_us: "Stash allows you to organize and view your own collection of adult video and image files. Think of it like a private PornHub site for your personal porn collection. Documentation: https://docs.stashapp.cc"
+  tagline:
+    en_us: "An organizer for your porn, written in Go"
+  screenshot_link:
+    - https://github.com/stashapp/stash/raw/develop/docs/readme_assets/demo_image.png
+    - https://cdn.jsdelivr.net/gh/f4bio/CasaOS-AppStore@develop/Apps/Stash/home_screenshot.jpg
+    - https://cdn.jsdelivr.net/gh/f4bio/CasaOS-AppStore@develop/Apps/Stash/scenes_screenshot.jpg
+    - https://cdn.jsdelivr.net/gh/f4bio/CasaOS-AppStore@develop/Apps/Stash/settings_screenshot.jpg
+  developer: Stash
+  icon: https://cdn.jsdelivr.net/gh/f4bio/CasaOS-AppStore@develop/Apps/Stash/icon.png
+  thumbnail: https://cdn.jsdelivr.net/gh/f4bio/CasaOS-AppStore@develop/Apps/Stash/thumbnail.jpg
+  title:
+    en_us: Stash
+  category: Utilities
+  port_map: "9999"
diff --git a/Apps/Stash/home_screenshot.jpg b/Apps/Stash/home_screenshot.jpg
new file mode 100644
index 000000000..8d3705730
Binary files /dev/null and b/Apps/Stash/home_screenshot.jpg differ
diff --git a/Apps/Stash/icon.png b/Apps/Stash/icon.png
new file mode 100644
index 000000000..556e79aee
Binary files /dev/null and b/Apps/Stash/icon.png differ
diff --git a/Apps/Stash/scenes_screenshot.jpg b/Apps/Stash/scenes_screenshot.jpg
new file mode 100644
index 000000000..82929ee97
Binary files /dev/null and b/Apps/Stash/scenes_screenshot.jpg differ
diff --git a/Apps/Stash/settings_screenshot.jpg b/Apps/Stash/settings_screenshot.jpg
new file mode 100644
index 000000000..89d0ea496
Binary files /dev/null and b/Apps/Stash/settings_screenshot.jpg differ
diff --git a/Apps/Stash/thumbnail.jpg b/Apps/Stash/thumbnail.jpg
new file mode 100644
index 000000000..5c5a3b5de
Binary files /dev/null and b/Apps/Stash/thumbnail.jpg differ