diff --git a/bxl-shp/apps/docker-compose.dashy.yaml b/bxl-shp/apps/docker-compose.dashy.yaml
index d46e029..3d9cde4 100644
--- a/bxl-shp/apps/docker-compose.dashy.yaml
+++ b/bxl-shp/apps/docker-compose.dashy.yaml
@@ -15,7 +15,7 @@ services:
     - "traefik.http.routers.dashy.tls=true"
     - "traefik.http.routers.dashy.tls.certresolver=http"
     - "traefik.http.routers.dashy.middlewares=authelia@docker"
-    - "com.centurylinklabs.watchtower.enable=false"
+    - "com.centurylinklabs.watchtower.enable=true"
     healthcheck:
       test: ['CMD', 'node', '/app/services/healthcheck']
       interval: 1m30s
@@ -40,7 +40,7 @@ services:
     - "traefik.http.routers.dashy-sd.tls=true"
     - "traefik.http.routers.dashy-sd.tls.certresolver=http"
     - "traefik.http.routers.dashy-sd.middlewares=authelia@docker"
-    - "com.centurylinklabs.watchtower.enable=false"
+    - "com.centurylinklabs.watchtower.enable=true"
     healthcheck:
       test: ['CMD', 'node', '/app/services/healthcheck']
       interval: 1m30s
diff --git a/bxl-shp/apps/docker-compose.ferdium.yaml b/bxl-shp/apps/docker-compose.ferdium.yaml
index 91030bb..2b1b0ab 100644
--- a/bxl-shp/apps/docker-compose.ferdium.yaml
+++ b/bxl-shp/apps/docker-compose.ferdium.yaml
@@ -32,6 +32,7 @@ services:
     - "traefik.http.routers.ferdium.tls=true"
     - "traefik.http.routers.ferdium.tls.certresolver=http"
     - "traefik.http.routers.ferdium.entrypoints=internalsecure,externalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     volumes:
     - $DATA/ferdium/data:/data
     - $DATA/ferdium/recipes:/app/recipes
diff --git a/bxl-shp/apps/docker-compose.file.yaml b/bxl-shp/apps/docker-compose.file.yaml
index dc9a0f6..e87010d 100644
--- a/bxl-shp/apps/docker-compose.file.yaml
+++ b/bxl-shp/apps/docker-compose.file.yaml
@@ -21,6 +21,7 @@ services:
     - "traefik.http.routers.onlyoffice-editor.tls.certresolver=http"
     - "traefik.http.routers.onlyoffice-editor.entrypoints=internalsecure,externalsecure"
     - "traefik.http.routers.onlyoffice-editor.middlewares=httpsupgrade"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - external
     - file
@@ -69,6 +70,7 @@ services:
     - "traefik.http.routers.seafile.tls=true"
     - "traefik.http.routers.seafile.tls.certresolver=http"
     - "traefik.http.routers.seafile.entrypoints=internalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - file
     - external
diff --git a/bxl-shp/apps/docker-compose.focalboard.yaml b/bxl-shp/apps/docker-compose.focalboard.yaml
index 06befa1..46e3c42 100644
--- a/bxl-shp/apps/docker-compose.focalboard.yaml
+++ b/bxl-shp/apps/docker-compose.focalboard.yaml
@@ -25,6 +25,7 @@ services:
     - "traefik.http.routers.focalboard.tls=true"
     - "traefik.http.routers.focalboard.tls.certresolver=http"
     - "traefik.http.routers.focalboard.entrypoints=internalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - external
     - storage
diff --git a/bxl-shp/apps/docker-compose.gitea.yaml b/bxl-shp/apps/docker-compose.gitea.yaml
index 682cfcd..1814878 100644
--- a/bxl-shp/apps/docker-compose.gitea.yaml
+++ b/bxl-shp/apps/docker-compose.gitea.yaml
@@ -38,6 +38,8 @@ services:
     - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock
+    labels:
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - gitea
 
diff --git a/bxl-shp/apps/docker-compose.honeypots.yaml b/bxl-shp/apps/docker-compose.honeypots.yaml
index 9899ac5..1c17d2e 100644
--- a/bxl-shp/apps/docker-compose.honeypots.yaml
+++ b/bxl-shp/apps/docker-compose.honeypots.yaml
@@ -2,6 +2,8 @@ services:
   ssh-honeypot:
     container_name: ssh-honeypot
     image: registry.bhasher.com/ssh-honeypot:latest
+    labels:
+    - "com.centurylinklabs.watchtower.enable=true"
     environment:
     - PORT=24587
     volumes:
diff --git a/bxl-shp/apps/docker-compose.invoice.yaml b/bxl-shp/apps/docker-compose.invoice.yaml
index afd1299..a1167e4 100644
--- a/bxl-shp/apps/docker-compose.invoice.yaml
+++ b/bxl-shp/apps/docker-compose.invoice.yaml
@@ -7,7 +7,7 @@ services:
     - $DATA/invoiceplane/uploads:/var/www/html/uploads
     - $DATA/invoiceplane/ipconfig.php:/var/www/html/ipconfig.php
     - /etc/localtime:/etc/localtime:ro
-    command: sh -c "apk add php7-mbstring php7-iconv php7-json gd && nginx -g 'daemon off;'"
+    #command: sh -c "apk add php7-mbstring php7-iconv php7-json gd && nginx -g 'daemon off;'"
     environment:
     - IP_URL=https://invoice.bhasher.com
     #- MYSQL_HOST=mariadb
@@ -22,6 +22,7 @@ services:
     - "traefik.http.routers.invoice.tls=true"
     - "traefik.http.routers.invoice.tls.certresolver=http"
     - "traefik.http.routers.invoice.entrypoints=internalsecure,externalsecure"
+    #- "com.centurylinklabs.watchtower.enable=true"
     networks:
     - external
     - storage
diff --git a/bxl-shp/apps/docker-compose.iodine.yaml b/bxl-shp/apps/docker-compose.iodine.yaml
index cbfad7c..937779d 100644
--- a/bxl-shp/apps/docker-compose.iodine.yaml
+++ b/bxl-shp/apps/docker-compose.iodine.yaml
@@ -3,6 +3,8 @@ services:
     container_name: iodine
     image: registry.bhasher.com/iodine:latest
     restart: unless-stopped
+    labels:
+    - "com.centurylinklabs.watchtower.enable=true"
     environment:
     - IP=10.10.0.1
     - DOMAIN=dns.bhasher.com
diff --git a/bxl-shp/apps/docker-compose.joplin.yaml b/bxl-shp/apps/docker-compose.joplin.yaml
index 41c09b9..8d12a08 100644
--- a/bxl-shp/apps/docker-compose.joplin.yaml
+++ b/bxl-shp/apps/docker-compose.joplin.yaml
@@ -24,6 +24,7 @@ services:
     - "traefik.http.routers.joplin.tls=true"
     - "traefik.http.routers.joplin.tls.certresolver=http"
     - "traefik.http.routers.joplin.entrypoints=internalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - storage
     - external
diff --git a/bxl-shp/apps/docker-compose.mealie.yaml b/bxl-shp/apps/docker-compose.mealie.yaml
index cefdc1a..8b056d5 100644
--- a/bxl-shp/apps/docker-compose.mealie.yaml
+++ b/bxl-shp/apps/docker-compose.mealie.yaml
@@ -20,6 +20,7 @@ services:
     - "traefik.http.routers.mealie.tls=true"
     - "traefik.http.routers.mealie.tls.certresolver=http"
     - "traefik.http.routers.mealie.entrypoints=internalsecure,externalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     volumes:
     - $DATA/mealie/:/app/data
     networks:
diff --git a/bxl-shp/apps/docker-compose.mediaserver.yaml b/bxl-shp/apps/docker-compose.mediaserver.yaml
index 658fe79..5aa4a3f 100644
--- a/bxl-shp/apps/docker-compose.mediaserver.yaml
+++ b/bxl-shp/apps/docker-compose.mediaserver.yaml
@@ -19,6 +19,7 @@ services:
     - "traefik.http.services.jellyfin.loadbalancer.server.port=8096"
     - "traefik.http.routers.jellyfin.tls=true"
     - "traefik.http.routers.jellyfin.tls.certresolver=http"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - auth
     - external
@@ -43,6 +44,7 @@ services:
     - "traefik.http.routers.radarr.tls.certresolver=http"
     - "traefik.http.routers.radarr.entrypoints=internalsecure"
     - "traefik.http.routers.radarr.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
     - external
@@ -67,6 +69,7 @@ services:
     - "traefik.http.routers.sonarr.tls.certresolver=http"
     - "traefik.http.routers.sonarr.entrypoints=internalsecure"
     - "traefik.http.routers.sonarr.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
     - external
@@ -91,6 +94,7 @@ services:
     - "traefik.http.routers.lidarr.tls.certresolver=http"
     - "traefik.http.routers.lidarr.entrypoints=internalsecure"
     - "traefik.http.routers.lidarr.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
     - external
@@ -118,34 +122,11 @@ services:
     - "traefik.http.routers.transmission.tls.certresolver=http"
     - "traefik.http.routers.transmission.entrypoints=internalsecure"
     - "traefik.http.routers.transmission.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
     - external
 
-#  jackett:
-#    container_name: jackett
-#    image: lscr.io/linuxserver/jackett:latest
-#    environment:
-#    - PUID=1000
-#    - PGID=1000
-#    - TZ=Europe/Paris
-#    - AUTO_UPDATE=true
-#    volumes:
-#    - $DATA/mediaserver/jackett:/config
-#    - /mnt/movies/torrents:/downloads
-#    restart: unless-stopped
-#    labels:
-#    - "traefik.enable=true"
-#    - "traefik.http.routers.jackett.rule=Host(`jackett.bhasher.com`)"
-#    - "traefik.http.services.jackett.loadbalancer.server.port=9117"
-#    - "traefik.http.routers.jackett.tls=true"
-#    - "traefik.http.routers.jackett.tls.certresolver=http"
-#    - "traefik.http.routers.jackett.entrypoints=internalsecure"
-#    - "traefik.http.routers.jackett.middlewares=authelia@docker"
-#    networks:
-#    - mediaserver
-#    - external
-
   prowlarr:
     container_name: prowlarr
     image: lscr.io/linuxserver/prowlarr:latest
@@ -164,6 +145,7 @@ services:
     - "traefik.http.routers.prowlarr.tls.certresolver=http"
     - "traefik.http.routers.prowlarr.entrypoints=internalsecure"
     - "traefik.http.routers.prowlarr.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
     - external
@@ -177,6 +159,8 @@ services:
     - CAPTCHA_SOLVER=none
     - TZ=Europe/Paris
     restart: unless-stopped
+    labels:
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
 
@@ -200,6 +184,7 @@ services:
     - "traefik.http.routers.bazarr.tls.certresolver=http"
     - "traefik.http.routers.bazarr.entrypoints=internalsecure"
     - "traefik.http.routers.bazarr.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - mediaserver
     - external
@@ -215,6 +200,4 @@ services:
 
 networks:
   mediaserver:
-  external:
-    external: true
 
diff --git a/bxl-shp/apps/docker-compose.miniflux.yaml b/bxl-shp/apps/docker-compose.miniflux.yaml
index 87cc2ba..ac2c99e 100644
--- a/bxl-shp/apps/docker-compose.miniflux.yaml
+++ b/bxl-shp/apps/docker-compose.miniflux.yaml
@@ -27,6 +27,7 @@ services:
     - "traefik.http.routers.minifluxshare.tls=true"
     - "traefik.http.routers.minifluxshare.tls.certresolver=http"
     - "traefik.http.routers.minifluxshare.entrypoints=externalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     healthcheck:
       test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
     networks:
diff --git a/bxl-shp/apps/docker-compose.portfolio.yaml b/bxl-shp/apps/docker-compose.portfolio.yaml
index ebd42c1..411fee9 100644
--- a/bxl-shp/apps/docker-compose.portfolio.yaml
+++ b/bxl-shp/apps/docker-compose.portfolio.yaml
@@ -14,6 +14,7 @@ services:
     - "traefik.http.routers.portfolio.tls=true"
     - "traefik.http.routers.portfolio.tls.certresolver=http"
     - "traefik.http.routers.portfolio.entrypoints=internalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - external
 
diff --git a/bxl-shp/apps/docker-compose.smarthome.yaml b/bxl-shp/apps/docker-compose.smarthome.yaml
index 05bebce..2d408df 100644
--- a/bxl-shp/apps/docker-compose.smarthome.yaml
+++ b/bxl-shp/apps/docker-compose.smarthome.yaml
@@ -16,6 +16,7 @@ services:
     - "traefik.http.services.hass.loadbalancer.server.port=8123"
     - "traefik.http.routers.hass.tls=true"
     - "traefik.http.routers.hass.tls.certresolver=http"
+    - "com.centurylinklabs.watchtower.enable=true"
     depends_on:
     - authelia
     - traefik
@@ -31,6 +32,8 @@ services:
     ports:
     - 1883:1883
     - 9001:9001
+    labels:
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - smarthome
     - external
@@ -46,6 +49,8 @@ services:
     - /etc/localtime:/etc/localtime:ro
     devices:
     - /dev/ttyACM0:/dev/ttyACM0
+    labels:
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - smarthome
     depends_on:
@@ -69,6 +74,7 @@ services:
     - "traefik.http.routers.nodered.tls=true"
     - "traefik.http.routers.nodered.tls.certresolver=http"
     - "traefik.http.routers.nodered.middlewares=authelia@docker"
+    - "com.centurylinklabs.watchtower.enable=true"
     depends_on:
     - hass
 
diff --git a/bxl-shp/apps/docker-compose.tg2.yaml b/bxl-shp/apps/docker-compose.tg2.yaml
index 06d47bf..4275720 100644
--- a/bxl-shp/apps/docker-compose.tg2.yaml
+++ b/bxl-shp/apps/docker-compose.tg2.yaml
@@ -15,5 +15,5 @@ services:
     volumes:
     - $DATA/tg2:/data
     labels:
-    - "com.centurylinklabs.watchtower.enable=false"
+    - "com.centurylinklabs.watchtower.enable=true"
 
diff --git a/bxl-shp/apps/docker-compose.trakr.yaml b/bxl-shp/apps/docker-compose.trakr.yaml
index 49d3b4e..9b40d65 100644
--- a/bxl-shp/apps/docker-compose.trakr.yaml
+++ b/bxl-shp/apps/docker-compose.trakr.yaml
@@ -22,5 +22,6 @@ services:
     - "traefik.http.routers.trakrpublic.tls=true"
     - "traefik.http.routers.trakrpublic.tls.certresolver=http"
     - "traefik.http.routers.trakrpublic.entrypoints=internalsecure,externalsecure"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - external
diff --git a/bxl-shp/apps/docker-compose.wiki.yaml b/bxl-shp/apps/docker-compose.wiki.yaml
index 2dc21f7..15943ae 100644
--- a/bxl-shp/apps/docker-compose.wiki.yaml
+++ b/bxl-shp/apps/docker-compose.wiki.yaml
@@ -19,6 +19,7 @@ services:
     - "traefik.http.services.wikijs.loadbalancer.server.port=3000"
     - "traefik.http.routers.wikijs.tls=true"
     - "traefik.http.routers.wikijs.tls.certresolver=http"
+    - "com.centurylinklabs.watchtower.enable=true"
     networks:
     - storage
     - external
diff --git a/bxl-shp/system/docker-compose.watchtower.yaml b/bxl-shp/system/docker-compose.watchtower.yaml
index 958e25e..9dabc9f 100644
--- a/bxl-shp/system/docker-compose.watchtower.yaml
+++ b/bxl-shp/system/docker-compose.watchtower.yaml
@@ -26,7 +26,7 @@ services:
     networks:
     - monitoring
     labels:
-    - "com.centurylinklabs.watchtower.enable=false"
+    - "com.centurylinklabs.watchtower.enable=true"
 
 networks:
   monitoring: