diff --git a/.env b/.env
index bd5009f..c753c21 100644
--- a/.env
+++ b/.env
@@ -51,4 +51,6 @@ DOKKU_INTERNAL_PORT_3=443
 LOKI_EXTERNAL_PORT=3200
 LOKI_INTERNAL_PORT=3100
 GRAFANA_EXTERNAL_PORT=3600
-GRAFANA_INTERNAL_PORT=3000
\ No newline at end of file
+GRAFANA_INTERNAL_PORT=3000
+STASH_EXTERNAL_PORT=9999
+STASH_INTERNAL_PORT=9999
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 49cafe7..6c7cecf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -431,6 +431,45 @@ services:
       - infra
     restart: unless-stopped
 
+  stash:
+    image: stashapp/stash:latest
+    container_name: stash
+    ports:
+      - "${STASH_EXTERNAL_PORT}:${STASH_INTERNAL_PORT}"
+    ## If you intend to use stash's DLNA functionality uncomment the below network mode and comment out the above ports section
+    # network_mode: host
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "2m"
+    environment:
+      - STASH_STASH=/data/
+      - STASH_GENERATED=/generated/
+      - STASH_METADATA=/metadata/
+      - STASH_CACHE=/cache/
+      - STASH_PORT=${STASH_INTERNAL_PORT}
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      ## Adjust below paths (the left part) to your liking.
+      ## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash
+
+      ## Keep configs, scrapers, and plugins here.
+      - "${DOCKER_STORAGE_PATH}/stash/config:/root/.stash"
+      ## Point this at your collection.
+      - "${STORAGE_PATH}/xxx:/data/"
+      ## This is where your stash's metadata lives
+      - "${DOCKER_STORAGE_PATH}/stash/metadata:/metadata"
+      ## Any other cache content.
+      - "${DOCKER_STORAGE_PATH}/stash/cache:/cache"
+      ## Where to store generated content (screenshots,previews,transcodes,sprites)
+      - "${DOCKER_STORAGE_PATH}/stash/generated:/generated"
+    networks:
+      - public
+    profiles:
+      - base
+    restart: unless-stopped
+
 networks:
   loki:
   caddy: