diff --git a/templates/compose/diun.yaml b/templates/compose/diun.yaml
index 3f36d1775..2894917e5 100644
--- a/templates/compose/diun.yaml
+++ b/templates/compose/diun.yaml
@@ -3,29 +3,25 @@
 # tags: docker, notifier, slack
 # logo: svgs/diun.svg
 
-
 services:
   diun:
-    image: 'crazymax/diun:latest'
-    container_name: diun
+    image: crazymax/diun:latest
     command: serve
     volumes:
-      - './data:/data'
-      - '/var/run/docker.sock:/var/run/docker.sock'
+      - "diun_data:/data"
+      - "/var/run/docker.sock:/var/run/docker.sock"
     environment:
       - TZ=${TIME_ZONE:-Europe/Vienna}
-      - LOG_LEVEL=info
-      - LOG_JSON=false
-      - DIUN_WATCH_WORKERS=20
+      - LOG_LEVEL=${LOG_LEVEL:-info}
+      - LOG_JSON=${LOG_JSON:-false}
+      - DIUN_WATCH_WORKERS=${DIUN_WATCH_WORKERS:-20}
       - DIUN_WATCH_SCHEDULE=${CRON_WATCH_SCHEDULE:- * */6 * * *}
-      - DIUN_WATCH_JITTER=30s
-      - DIUN_PROVIDERS_DOCKER=true
-      - DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true
-      #SLACK
-      - DIUN_NOTIF_SLACK_WEBHOOKURL=${WEB_HOOK_URL}
-    restart: always
+      - DIUN_WATCH_JITTER=${DIUN_WATCH_JITTER:-30s}
+      - DIUN_PROVIDERS_DOCKER=${DIUN_PROVIDERS_DOCKER:-true}
+      - DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=${DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT:-true}
+      - DIUN_NOTIF_SLACK_WEBHOOKURL=${SERVICE_WEBHOOK_URL_SLACK}
     healthcheck:
       test: ["CMD", "diun", "--version"]
       interval: 5s
       timeout: 20s
-      retries: 3
\ No newline at end of file
+      retries: 3