diff --git a/apps/gramps/docker-compose.yml b/apps/gramps/docker-compose.yml
index 71b7b9c..d7f927f 100644
--- a/apps/gramps/docker-compose.yml
+++ b/apps/gramps/docker-compose.yml
@@ -122,7 +122,7 @@ services:
 
   gramps-redis:
     profiles: ["apps","all","gramps"]
-    image: valkey/valkey:8-alpine
+    image: valkey/valkey:9-trixie
     container_name: gramps-redis
     restart: always
     networks:
diff --git a/apps/passbolt/docker-compose.yml b/apps/passbolt/docker-compose.yml
index 2fd7678..4170262 100644
--- a/apps/passbolt/docker-compose.yml
+++ b/apps/passbolt/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   passbolt-db:
     profiles: ["apps","all","passbolt"]
     container_name: passbolt-db
-    image: mariadb:12
+    image: mariadb:latest
     restart: always
 #    env_file:
 #      - ${PROJECT_ROOT}/secrets/stack-secrets.env
diff --git a/core/traefik/docker-compose.yml b/core/traefik/docker-compose.yml
index f3aa198..7c5d51b 100644
--- a/core/traefik/docker-compose.yml
+++ b/core/traefik/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   traefik:
     profiles: ["core","all","traefik"]
-    image: traefik:3
+    image: traefik:latest
     container_name: traefik
     restart: always
     read_only: true
diff --git a/monitoring/wud/docker-compose.yml b/monitoring/wud/docker-compose.yml
index 67c111c..f8acba1 100644
--- a/monitoring/wud/docker-compose.yml
+++ b/monitoring/wud/docker-compose.yml
@@ -10,23 +10,28 @@ services:
 
     volumes:
       - ${DOCKER_VOLUMES}/wud:/store
-
+ #     - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
+      TZ: ${TZ}
+      WUD_LOG_LEVEL: TRACE
       # Docker Socket Proxy
-      WUD_WATCHER_LOCAL_HOST: ${DOCKER_SOCKET_PROXY_HOST}
-
+      WUD_WATCHER_LOCAL_HOST: docker-socket-proxy
+#      WUD_WATCHER_LOCAL_SOCKET: /var/run/docker.sock
       # Check every 6 hours
       WUD_WATCHER_LOCAL_CRON: ${WUD_WATCHER_LOCAL_CRON}
+      WUD_WATCHER_LOCAL_WATCHBYDEFAULT: false
 
+      WUD_WATCHER_RASPI_HOST: raspberrypi.tail13f623.ts.net
+      WUD_WATCHER_RASPI_CRON: ${WUD_WATCHER_LOCAL_CRON}
       # Gotify
       # WUD_TRIGGER_GOTIFY_URL: ${WUD_TRIGGER_GOTIFY_URL}
       # WUD_TRIGGER_GOTIFY_TOKEN: ${WUD_TRIGGER_GOTIFY_TOKEN}
       # WUD_TRIGGER_GOTIFY_PRIORITY: ${WUD_TRIGGER_GOTIFY_PRIORITY}
       # WUD_TRIGGER_GOTIFY_TITLE: ${WUD_TRIGGER_GOTIFY_TITLE} 
-     
+
       WUD_TRIGGER_GOTIFY_gotify_PRIORITY: ${WUD_TRIGGER_GOTIFY_PRIORITY}
       WUD_TRIGGER_GOTIFY_gotify_TOKEN: ${WUD_TRIGGER_GOTIFY_gotify_TOKEN}
-      WUD_TRIGGER_GOTIFY_gotify_URL: ${WUD_TRIGGER_GOTIFY_URL}
+      WUD_TRIGGER_GOTIFY_gotify_URL: http://gotify
 
 
     labels:
@@ -40,4 +45,11 @@ services:
       - "traefik.http.services.wud.loadbalancer.server.port=3000"
 
     networks:
-      - traefik
\ No newline at end of file
+      - traefik
+
+    healthcheck:
+      test: curl --fail http://localhost:${WUD_SERVER_PORT:-3000}/health || exit 1
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 10s