diff --git a/.gitignore b/.gitignore
index 456e5ce..7d51608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
 
 cloudflare/tailscale/
-nginxproxymanager/*/
 media/audiobookshelf/
 ntfy/*/
 vaultwarden/*/
-pinchflat/
+pinchflat/config/
 homepage/config/logs/
 speedtest/config/
 caddy/caddy*
diff --git a/adguard/docker-compose.yml b/adguard/docker-compose.yml
index 4d69b76..dda44ea 100644
--- a/adguard/docker-compose.yml
+++ b/adguard/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       - config:/opt/adguardhome/conf # app configuration
       - work:/opt/adguardhome/work # app working directory
     restart: always
+    labels:
+      - diun.enable=true
 volumes:
   config:
     driver: local
diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml
index feec6b6..6106a0c 100644
--- a/caddy/docker-compose.yml
+++ b/caddy/docker-compose.yml
@@ -1,4 +1,5 @@
 services:
+
   caddy:
     image: caddy/caddy:latest
     restart: always
@@ -12,7 +13,8 @@ services:
       - caddy_config:/config
     extra_hosts:
       - host.docker.internal:host-gateway
-
+    labels:
+      - diun.enable=true
 volumes:
   caddy_data:
   caddy_config:
diff --git a/cloudflare/docker-compose.yml b/cloudflare/docker-compose.yml
index 1cebafc..2a178a7 100644
--- a/cloudflare/docker-compose.yml
+++ b/cloudflare/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     command: tunnel --no-autoupdate run --token ${CLOUDFLARE_TUNNEL_TOKEN}
     depends_on:
       - tailscale
+    labels:
+      - diun.enable=true
   tailscale:
     container_name: tailscale
     image: tailscale/tailscale:stable
@@ -22,4 +24,6 @@ services:
     command: tailscaled
     privileged: true
     restart: unless-stopped
+    labels:
+      - diun.enable=true
 networks: {}
diff --git a/database/docker-compose.yml b/database/docker-compose.yml
index 9e3753e..55a8497 100644
--- a/database/docker-compose.yml
+++ b/database/docker-compose.yml
@@ -13,6 +13,8 @@ services:
     networks:
       - postgres
     restart: unless-stopped
+    labels:
+      - diun.enable=true
 
   pgadmin:
     container_name: pgadmin_container
@@ -28,6 +30,8 @@ services:
     networks:
       - postgres
     restart: unless-stopped
+    labels:
+      - diun.enable=true
 
 networks:
   postgres:
diff --git a/diun/compose.yaml b/diun/compose.yaml
index 352317a..6202394 100644
--- a/diun/compose.yaml
+++ b/diun/compose.yaml
@@ -1,19 +1,22 @@
-
 services:
   diun:
     image: crazymax/diun:latest
     command: serve
+    hostname: diun
     volumes:
       - ./data:/data
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - TZ=America/New_York
       - DIUN_WATCH_WORKERS=20
-      - DIUN_WATCH_SCHEDULE=0 */6 * * *
+      - DIUN_WATCH_SCHEDULE=0 */2 * * *
       - DIUN_WATCH_JITTER=30s
+      - DIUN_DEFAULTS_NOTIFYON=new,update
       - DIUN_PROVIDERS_DOCKER=true
       - DIUN_NOTIF_TELEGRAM_TOKEN=${TELEGRAM_TOKEN}
       - DIUN_NOTIF_TELEGRAM_CHATIDS=${TELEGRAM_CHAT_ID}
+      - LOG_LEVEL=debug
+      - LOG_JSON=false
     labels:
       - diun.enable=true
-    restart: always
+    restart: unless-stopped
diff --git a/dozzle/docker-compose.yml b/dozzle/docker-compose.yml
index 889b891..536c41b 100644
--- a/dozzle/docker-compose.yml
+++ b/dozzle/docker-compose.yml
@@ -14,4 +14,5 @@ services:
       DOZZLE_AUTH_HEADER_EMAIL: ${DOZZLE_AUTH_HEADER_EMAIL}
       DOZZLE_AUTH_HEADER_NAME: ${DOZZLE_AUTH_HEADER_NAME}
     restart: unless-stopped
-networks: {}
+    labels:
+      - diun.enable=true
diff --git a/golinks/docker-compose.yml b/golinks/docker-compose.yml
index 6d086d0..e209e2b 100644
--- a/golinks/docker-compose.yml
+++ b/golinks/docker-compose.yml
@@ -5,6 +5,8 @@ services:
     image: ghcr.io/tailscale/golink:main
     volumes:
       - golinks_data:/home/nonroot
+    labels:
+      - diun.enable=true
 
 volumes:
   golinks_data:
diff --git a/hoarder/docker-compose.yml b/hoarder/docker-compose.yml
index b32f918..c2883bc 100644
--- a/hoarder/docker-compose.yml
+++ b/hoarder/docker-compose.yml
@@ -14,9 +14,13 @@ services:
       NEXTAUTH_URL: ${NEXTAUTH_URL}
       MEILI_MASTER_KEY: ${MEILI_MASTER_KEY}
       DATA_DIR: /data
+    labels:
+      - diun.enable=true
   chrome:
     image: gcr.io/zenika-hub/alpine-chrome:123
     restart: unless-stopped
+    labels:
+      - diun.enable=true
     command:
       - --no-sandbox
       - --disable-gpu
@@ -31,6 +35,8 @@ services:
       MEILI_NO_ANALYTICS: true
     volumes:
       - meilisearch:/meili_data
+    labels:
+      - diun.enable=true
 
 volumes:
   meilisearch:
diff --git a/homepage/docker-compose.yml b/homepage/docker-compose.yml
index bc892d9..3ce447d 100644
--- a/homepage/docker-compose.yml
+++ b/homepage/docker-compose.yml
@@ -12,3 +12,5 @@ services:
       - ./config:/app/config
       - /var/run/docker.sock:/var/run/docker.sock:ro
     restart: unless-stopped
+    labels:
+      - diun.enable=true
\ No newline at end of file
diff --git a/mealie/docker-compose.yml b/mealie/docker-compose.yml
index 6ddb578..c969417 100644
--- a/mealie/docker-compose.yml
+++ b/mealie/docker-compose.yml
@@ -29,6 +29,8 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
+    labels:
+      - diun.enable=true
   postgres:
     container_name: postgres
     image: postgres:15
@@ -45,11 +47,8 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
+    labels:
+      - diun.enable=true
 volumes:
   mealie-data: null
   mealie-pgdata: null
-networks:
-  cloudflare_default:
-    external: true
-x-dockge:
-  urls: []
diff --git a/media/docker-compose.yml b/media/docker-compose.yml
index 0efcaeb..6c993bd 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -24,6 +24,8 @@ services:
       - TZ=America/New_York # Timezone for accurate log times
       - SERVER_COUNTRIES=United States
     restart: always
+    labels:
+      - diun.enable=true
   sabnzbd:
     image: lscr.io/linuxserver/sabnzbd:latest
     container_name: sabnzbd
@@ -39,6 +41,8 @@ services:
     # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above
     network_mode: service:gluetun
     restart: always
+    labels:
+      - diun.enable=true
   sonarr:
     image: lscr.io/linuxserver/sonarr:latest
     container_name: sonarr
@@ -55,9 +59,9 @@ services:
       - /data/usenet/downloads:/downloads
     ports:
       - 8989:8989
-    networks:
-      - cloudflare_default
     restart: always
+    labels:
+      - diun.enable=true
   radarr:
     image: lscr.io/linuxserver/radarr:latest
     container_name: radarr
@@ -74,8 +78,6 @@ services:
       - /data/usenet/downloads:/downloads
     ports:
       - 7878:7878
-    networks:
-      - cloudflare_default
     restart: always
   prowlarr:
     image: lscr.io/linuxserver/prowlarr:latest
@@ -88,9 +90,9 @@ services:
       - /docker/config/prowlarr:/config
     ports:
       - 9696:9696
-    networks:
-      - cloudflare_default
     restart: always
+    labels:
+      - diun.enable=true
   tautulli:
     image: lscr.io/linuxserver/tautulli:latest
     container_name: tautulli
@@ -102,9 +104,9 @@ services:
       - tautulli:/config
     ports:
       - 8181:8181
-    networks:
-      - cloudflare_default
     restart: always
+    labels:
+      - diun.enable=true
   audiobookshelf:
     image: ghcr.io/advplyr/audiobookshelf:latest
     container_name: audiobookshelf
@@ -118,12 +120,11 @@ services:
       - ./audiobookshelf/metadata:/metadata
     environment:
       - TZ=America/New_York
-
+    restart: always
+    labels:
+      - diun.enable=true
 volumes:
   gluetun_data: null
   sabnzbd_data: null
   tautulli: null
-
-networks:
-  cloudflare_default:
-    external: true
+  
diff --git a/memos/docker-compose.yml b/memos/docker-compose.yml
index 70f1b85..40bd34a 100644
--- a/memos/docker-compose.yml
+++ b/memos/docker-compose.yml
@@ -9,7 +9,5 @@ services:
     networks:
       - cloudflare_default
     restart: unless-stopped
-
-networks:
-  cloudflare_default:
-    external: true
\ No newline at end of file
+    labels:
+      - diun.enable=true
\ No newline at end of file
diff --git a/metube/docker-compose.yml b/metube/docker-compose.yml
index c3a05f5..9ce9cea 100644
--- a/metube/docker-compose.yml
+++ b/metube/docker-compose.yml
@@ -13,4 +13,5 @@ services:
       - 7081:8081
     volumes:
       - /mnt/share/media/metube:/downloads
-networks: {}
+    labels:
+      - diun.enable=true
diff --git a/nginxproxymanager/docker-compose.yml b/nginxproxymanager/docker-compose.yml
index 10f697a..40c7c00 100644
--- a/nginxproxymanager/docker-compose.yml
+++ b/nginxproxymanager/docker-compose.yml
@@ -25,13 +25,13 @@ services:
       DB_MYSQL_USER: npm
       DB_MYSQL_PASSWORD: npm
       DB_MYSQL_NAME: npm
-    networks:
-      - cloudflare_default
     volumes:
       - ./data:/data
       - ./letsencrypt:/etc/letsencrypt
     depends_on:
       - db
+    labels:
+      - diun.enable=true
   db:
     image: jc21/mariadb-aria:latest
     restart: unless-stopped
@@ -42,6 +42,5 @@ services:
       MYSQL_PASSWORD: npm
     volumes:
       - ./mysql:/var/lib/mysql
-networks:
-  cloudflare_default:
-    external: true
+    labels:
+      - diun.enable=true
diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml
index 1544d67..6612588 100644
--- a/ntfy/docker-compose.yml
+++ b/ntfy/docker-compose.yml
@@ -15,3 +15,5 @@ services:
       - 4080:80
       - 4443:443
     restart: unless-stopped
+    labels:
+      - diun.enable=true
diff --git a/pdf/docker-compose.yml b/pdf/docker-compose.yml
index d11546a..2d806a5 100644
--- a/pdf/docker-compose.yml
+++ b/pdf/docker-compose.yml
@@ -23,4 +23,6 @@ services:
       UI_HOMEDESCRIPTION: ""
       UI_APPNAMENAVBAR: ""
       SYSTEM_MAXFILESIZE: "100"
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
+    labels:
+      - diun.enable=true
\ No newline at end of file
diff --git a/pinchflat/docker-compose.yml b/pinchflat/docker-compose.yml
index 8057001..8f2ab66 100644
--- a/pinchflat/docker-compose.yml
+++ b/pinchflat/docker-compose.yml
@@ -8,6 +8,6 @@ services:
       - ./config:/config
       - /mnt/share/media/youtube:/downloads
     image: ghcr.io/kieraneglin/pinchflat:latest
-networks:
-  cloudflare_default:
-    external: true
+    restart: unless-stopped
+    labels:
+      - diun.enable=true
diff --git a/speedtest/docker-compose.yml b/speedtest/docker-compose.yml
index c03b9a1..f12a1f9 100644
--- a/speedtest/docker-compose.yml
+++ b/speedtest/docker-compose.yml
@@ -18,4 +18,5 @@ services:
     volumes:
       - ./config:/config
     restart: unless-stopped
-networks: {}
+    labels:
+      - diun.enable=true
diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/docker-compose.yml
index 08ae47f..4325f11 100644
--- a/uptime-kuma/docker-compose.yml
+++ b/uptime-kuma/docker-compose.yml
@@ -7,8 +7,9 @@ services:
     ports:
       - 6001:3001
     restart: unless-stopped
-
+    labels:
+      - diun.enable=true
 volumes:
-  uptime-kuma: 
+  uptime-kuma:
     name: uptime-kuma
     external: true
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 389df35..8c93f5f 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -14,7 +14,8 @@ services:
       - ROCKET_PORT=80
       - ROCKET_PROFILE=release
     restart: always
-
+    labels:
+      - diun.enable=true
 volumes:
   vaultwarden_data:
     name: vaultwarden_data