diff --git a/templates/compose/ntfy.yaml b/templates/compose/ntfy.yaml
index 3914136a5..47b66a124 100644
--- a/templates/compose/ntfy.yaml
+++ b/templates/compose/ntfy.yaml
@@ -7,12 +7,12 @@
 services:
   ntfy:
     image: binwiederhier/ntfy
-    container_name: ntfy
     command:
       - serve
     environment:
-      - TZ=${TZ:-UTC}
+      - SERVICE_FQDN_NTFY_80
       - NTFY_BASE_URL=${SERVICE_FQDN_NTFY}
+      - TZ=${TZ:-UTC}
       - NTFY_CACHE_FILE=/var/cache/ntfy/cache.db
       - NTFY_AUTH_FILE=/var/lib/ntfy/auth.db
       - NTFY_UPSTREAM_BASE_URL=${UPSTREAM_BASE_URL:-https://ntfy.sh}
@@ -36,12 +36,11 @@ services:
       - NTFY_WEB_PUSH_PRIVATE_KEY=${NTFY_WEB_PUSH_PRIVATE_KEY}
       - NTFY_WEB_PUSH_EMAIL_ADDRESS=${NTFY_WEB_PUSH_EMAIL_ADDRESS}
     volumes:
-      - ./cache:/var/cache/ntfy
-      - ./db:/var/lib/ntfy/
+      - ntfy-cache:/var/cache/ntfy
+      - ntfy-db:/var/lib/ntfy/
     healthcheck:
       test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
       interval: 60s
       timeout: 10s
       retries: 3
       start_period: 40s
-    restart: unless-stopped