diff --git a/intern/docker_esphome/templates/docker-compose.yml b/intern/docker_esphome/templates/docker-compose.yml
index 6d3d0efe2fc3f046a9775162a77e79d8c505800d..f1975dbc206d1d75777a8a5584b6b15aab558876 100644
--- a/intern/docker_esphome/templates/docker-compose.yml
+++ b/intern/docker_esphome/templates/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   app:
 
-    image: esphome/esphome:2023.12
+    image: esphome/esphome:latest
     restart: always
     volumes:
       - "{{ basedir }}/config/:/config"
diff --git a/intern/docker_grafana/templates/docker-compose.yml b/intern/docker_grafana/templates/docker-compose.yml
index 139845d8d7faf3def2bd31c50a4db15b9dba2467..e8d66fe5b8f05a23d58a56b04905cbbbddc9115f 100644
--- a/intern/docker_grafana/templates/docker-compose.yml
+++ b/intern/docker_grafana/templates/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   app:
 
-    image: grafana/grafana:10.2.3
+    image: grafana/grafana:latest
     restart: always
     volumes:
       - "{{ basedir }}/grafana.ini:/etc/grafana/grafana.ini"
diff --git a/intern/docker_heimdall/templates/docker-compose.yml b/intern/docker_heimdall/templates/docker-compose.yml
index 049721a172e4c640cd28b787a0b03a8cac631298..9722de418eb81c034885c7c0e8a5d5816805e5c9 100644
--- a/intern/docker_heimdall/templates/docker-compose.yml
+++ b/intern/docker_heimdall/templates/docker-compose.yml
@@ -4,7 +4,7 @@ version: "2.1"
 services:
 
   app:
-    image: lscr.io/linuxserver/heimdall:2.5.8
+    image: lscr.io/linuxserver/heimdall:latest
     restart: always
     environment:
       - PUID=1000
diff --git a/intern/docker_homeassistant/templates/docker-compose.yml b/intern/docker_homeassistant/templates/docker-compose.yml
index f4bf2c6fd5a3d742a7bb17071da19c6929127e0e..b770ce40f3948e8d5fbbcb559aa84dfd3fdf6478 100644
--- a/intern/docker_homeassistant/templates/docker-compose.yml
+++ b/intern/docker_homeassistant/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   
   app:
 
-    image: homeassistant/home-assistant:2024.2
+    image: homeassistant/home-assistant:latest
     restart: always
     ports:
       - "{{ int_ip4 }}:{{ homematic_callback_port }}:{{ homematic_callback_port }}"
@@ -26,7 +26,7 @@ services:
   
   influxdb:
 
-    image: influxdb:2.7.5
+    image: influxdb:2
     restart: always
     ports:
       - "{{ int_ip4 }}:{{ influxdb_port }}:8086"
diff --git a/intern/docker_mqtt/templates/docker-compose.yml b/intern/docker_mqtt/templates/docker-compose.yml
index 63b6fcd4d655f5d31e4f2a20d781fdbb4d82559a..7edd906f64ce5f6edba34add896001e9660d72bf 100644
--- a/intern/docker_mqtt/templates/docker-compose.yml
+++ b/intern/docker_mqtt/templates/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   app:
 
-    image: eclipse-mosquitto:2.0.15
+    image: eclipse-mosquitto:2
     restart: always
     ports:
       - "{{mqtt_port}}:1883" 
@@ -16,7 +16,7 @@ services:
 
   influxdb:
 
-    image: influxdb:2.6.1
+    image: influxdb:2
     restart: always
     ports:
       - {{ int_ip4 }}:{{ influxdb_port }}:8086
@@ -34,7 +34,7 @@ services:
 
   tgbinary:
 
-    image: telegraf:1.25.3
+    image: telegraf:latest
     restart: always
     depends_on: 
       - app
@@ -45,7 +45,7 @@ services:
 
   tgfloat:
 
-    image: telegraf:1.25.3
+    image: telegraf:latest
     restart: always
     depends_on: 
       - app
diff --git a/intern/docker_nodered/templates/docker-compose.yml b/intern/docker_nodered/templates/docker-compose.yml
index f2e8d4f1abf44690c6ace513d41c22800f332ef5..98ed85b48f177163fa374bcdae10f716fc4b9b1b 100644
--- a/intern/docker_nodered/templates/docker-compose.yml
+++ b/intern/docker_nodered/templates/docker-compose.yml
@@ -9,7 +9,7 @@ version: "3"
 services:
 
   app:
-    image: nodered/node-red:3.1.3
+    image: nodered/node-red:latest
     restart: always
     volumes:
       - "{{ basedir }}/data:/data"
diff --git a/intern/docker_omada/templates/docker-compose.yml b/intern/docker_omada/templates/docker-compose.yml
index e981bada16308e5cbe7ec5a54a8678cae28a1ec9..4ccdfb95901f6c245977ccdc0423545cebbabdba 100644
--- a/intern/docker_omada/templates/docker-compose.yml
+++ b/intern/docker_omada/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: mbentley/omada-controller:5.12
+    image: mbentley/omada-controller:latest
     restart: always
     ports:
       - {{ omada_port_http }}:8088
diff --git a/remote/docker_homeassistant/templates/docker-compose.yml b/remote/docker_homeassistant/templates/docker-compose.yml
index 9b02cb4f10de349a16e7b65bd56c1e9ed7a83551..dd4c1e3fa89c66f57b6a3638448bd34ba28bba49 100644
--- a/remote/docker_homeassistant/templates/docker-compose.yml
+++ b/remote/docker_homeassistant/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   
   app:
 
-    image: homeassistant/home-assistant:2024.1.2
+    image: homeassistant/home-assistant:latest
     restart: always
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
@@ -24,7 +24,7 @@ services:
   
   influxdb:
 
-    image: influxdb:2.7.5
+    image: influxdb:2
     restart: always
     ports:
       - "{{ int_ip4 }}:{{ influxdb_port }}:8086"
diff --git a/remote/docker_netdata/templates/docker-compose.yml b/remote/docker_netdata/templates/docker-compose.yml
index bc1f81a504345877beb9a7100d42f446b14a3bbd..e22fc1391b485430631a8822ab4e1f98a31f64fc 100644
--- a/remote/docker_netdata/templates/docker-compose.yml
+++ b/remote/docker_netdata/templates/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   
   app:
-    image: netdata/netdata:v1.38.1
+    image: netdata/netdata:latest
     restart: always
     cap_add:
       - SYS_PTRACE
diff --git a/remote/docker_prometheus/templates/docker-compose.yml b/remote/docker_prometheus/templates/docker-compose.yml
index 94154cf9e4db16626c7b3fd1c49f96b1aecd9427..06d5d333c5a06d82aa53dc4527db1075e409cb89 100644
--- a/remote/docker_prometheus/templates/docker-compose.yml
+++ b/remote/docker_prometheus/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: prom/prometheus:v2.48.1
+    image: prom/prometheus:latest
     restart: always
     ports:
       - 9090:9090
@@ -27,7 +27,7 @@ services:
       - web
 
   snmp:
-    image: quay.io/prometheus/snmp-exporter:v0.25.0
+    image: quay.io/prometheus/snmp-exporter:latest
     restart: always
 
 
diff --git a/remote/docker_unifi/templates/docker-compose.yml b/remote/docker_unifi/templates/docker-compose.yml
index af715748f8c7f6e021fadd49bc034a97a405df5e..b20c7e1af2d310af65a5acbdd0ff7aad10f3d6b3 100644
--- a/remote/docker_unifi/templates/docker-compose.yml
+++ b/remote/docker_unifi/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: linuxserver/unifi-controller:8.0.24
+    image: linuxserver/unifi-controller:latest
     restart: always
     ports:
       - 8443:8443
diff --git a/testserver/docker_dockerstats/templates/docker-compose.yml b/testserver/docker_dockerstats/templates/docker-compose.yml
index 248d813dc7baedae29c85d340edd83749fa77712..b7b871e44001f773b0bdad625fc025b9588b2ff5 100644
--- a/testserver/docker_dockerstats/templates/docker-compose.yml
+++ b/testserver/docker_dockerstats/templates/docker-compose.yml
@@ -11,4 +11,6 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /usr/bin/docker:/usr/bin/docker
+    labels:
+      - com.centurylinklabs.watchtower.enable=false
 
diff --git a/testserver/docker_dokuwiki/templates/docker-compose.yml b/testserver/docker_dokuwiki/templates/docker-compose.yml
index 5cef278a9f4c605e335f12b1948fd30ebd3df9f9..f7d425f9ac92b956f979a466a58b85f9bf039a49 100644
--- a/testserver/docker_dokuwiki/templates/docker-compose.yml
+++ b/testserver/docker_dokuwiki/templates/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - /srv/dokuwiki/data/:/var/www/html
       - /srv/dokuwiki/pdftemplate/:/var/www/html/lib/plugins/dw2pdf/tpl/warpzone/
     labels:
+      - com.centurylinklabs.watchtower.enable=false
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
       - traefik.http.routers.{{ servicename }}.entrypoints=websecure
diff --git a/testserver/docker_gitlab/templates/docker-compose.yml b/testserver/docker_gitlab/templates/docker-compose.yml
index 161ba773edd750a8e943ed9564bbe1cfeb5b9b76..6b623c7f18aaf70db3252bc1a9a9266f40cebd50 100644
--- a/testserver/docker_gitlab/templates/docker-compose.yml
+++ b/testserver/docker_gitlab/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: gitlab/gitlab-ce:16.7.4-ce.0
+    image: gitlab/gitlab-ce:latest
     restart: always
     ports:
       - "444:22"
diff --git a/testserver/docker_icinga/templates/docker-compose.yml b/testserver/docker_icinga/templates/docker-compose.yml
index 1edfcb28d1a74506fa7e4d55c2e8e208c79fe04a..998f5859842d6ca1159e328179dc0024b363edc9 100644
--- a/testserver/docker_icinga/templates/docker-compose.yml
+++ b/testserver/docker_icinga/templates/docker-compose.yml
@@ -36,6 +36,7 @@ services:
       ICINGA2_FEATURE_GRAPHITE_PORT: 2003
       ICINGA2_FEATURE_DIRECTOR: 0
     labels:
+      - com.centurylinklabs.watchtower.enable=false
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}.middlewares={{ servicename }}-auth
       - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
@@ -46,6 +47,7 @@ services:
       - web
 
 
+  # TODO: Evaluate alternatives, possibly: mesosphere/traefik-forward-auth
   auth:
     image: thomseddon/traefik-forward-auth:2.2
     restart: always
@@ -62,6 +64,7 @@ services:
       PROVIDERS_GENERIC_OAUTH_SCOPE: profile
       PROVIDERS_GENERIC_OAUTH_TOKEN_STYLE: header
     labels:
+      - com.centurylinklabs.watchtower.enable=false
       - traefik.enable=true
       - traefik.http.middlewares.{{ servicename }}-auth.forwardauth.address=http://auth:4181
       - traefik.http.middlewares.{{ servicename }}-auth.forwardauth.authResponseHeaders=X-Forwarded-User
diff --git a/testserver/docker_mail/templates/docker-compose.yml b/testserver/docker_mail/templates/docker-compose.yml
index 5c1dd8128b05f5dc43f5dc52bd4a2d4e92e449dc..2d8e493774c2fb7792e76daa17633afd6dcc9536 100644
--- a/testserver/docker_mail/templates/docker-compose.yml
+++ b/testserver/docker_mail/templates/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   # External dependencies
   redis:
-    image: redis:alpine
+    image: redis:7-alpine
     restart: always
     volumes:
       - "{{ basedir }}/mailu/redis:/data"
@@ -142,7 +142,7 @@ services:
 
   # Optional mailu services: Database
   db:
-    image: mariadb:11.2
+    image: mariadb:11
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     restart: always
     volumes:
diff --git a/testserver/docker_traefik/templates/docker-compose.yml b/testserver/docker_traefik/templates/docker-compose.yml
index 865cd732d00d06602531b3703a9b684eafa02672..51b6d70811177a7b3ac36a67c52535a641b26508 100644
--- a/testserver/docker_traefik/templates/docker-compose.yml
+++ b/testserver/docker_traefik/templates/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
     app:
-        image: traefik:v3.0.0-beta5
+        image: traefik:3.0
         restart: always
         ports:
             - "80:80"
diff --git a/testserver/docker_uffd/templates/docker-compose.yml b/testserver/docker_uffd/templates/docker-compose.yml
index ca0dbef30e33ffed9797ad7d1d11841b05963a9d..b6cd606f978733398ab149dc575c95844bdbd578 100644
--- a/testserver/docker_uffd/templates/docker-compose.yml
+++ b/testserver/docker_uffd/templates/docker-compose.yml
@@ -28,6 +28,7 @@ services:
       UFFD_INITIAL_ADMIN_PW: "{{ uffd_admin_pass }}"
       UFFD_INITIAL_ADMIN_MAIL: "uffdadmin@jabertwo.de"
     labels:
+      - com.centurylinklabs.watchtower.enable=false
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
       - traefik.http.routers.{{ servicename }}.entrypoints=websecure
diff --git a/testserver/docker_wordpress/templates/docker-compose.yml b/testserver/docker_wordpress/templates/docker-compose.yml
index bd06cf593ae32bb2a4796b9599d661889ebe1e0a..b15d26db382b86e7c1ad846abc580eee3d4129d0 100644
--- a/testserver/docker_wordpress/templates/docker-compose.yml
+++ b/testserver/docker_wordpress/templates/docker-compose.yml
@@ -29,6 +29,7 @@ services:
       WORDPRESS_DB_USER: wordpress
       WORDPRESS_DB_PASSWORD: "{{ mysql_user_pass }}"
     labels:
+      - com.centurylinklabs.watchtower.enable=false
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
       - traefik.http.routers.{{ servicename }}.entrypoints=websecure
diff --git a/verwaltung/docker_gitea/templates/docker-compose.yml b/verwaltung/docker_gitea/templates/docker-compose.yml
index 6330d9e70fa6303886c33be1b2119529667e0b05..d1eef0b164256e3e214f10abc3f167b13f6940e4 100644
--- a/verwaltung/docker_gitea/templates/docker-compose.yml
+++ b/verwaltung/docker_gitea/templates/docker-compose.yml
@@ -4,7 +4,7 @@ version: "2.4"
 services:
 
   app:
-    image: gitea/gitea:1.21.4
+    image: gitea/gitea:1
     restart: always
     depends_on:
       - db
@@ -37,7 +37,7 @@ services:
 
 
   db:
-    image: mariadb:11.2.2
+    image: mariadb:11
     restart: always
     volumes:
       - /srv/gitea/db/:/var/lib/mysql
diff --git a/verwaltung/docker_jameica/templates/docker-compose.yml b/verwaltung/docker_jameica/templates/docker-compose.yml
index 6b7621023d4c3ca69c64be917e87f236d8008ed8..93f34e2e27cee2166269ea9fc09f43668b044f22 100644
--- a/verwaltung/docker_jameica/templates/docker-compose.yml
+++ b/verwaltung/docker_jameica/templates/docker-compose.yml
@@ -18,7 +18,7 @@ services:
 
 
   ldap_auth:
-    image: pinepain/ldap-auth-proxy:0.2.0
+    image: pinepain/ldap-auth-proxy:latest
     restart: always
     environment:
       LOG_LEVEL: "info"
@@ -36,7 +36,7 @@ services:
 
 
   nginx:
-    image: nginx:1.25
+    image: nginx:1
     restart: always
     depends_on:
       - vnc
diff --git a/verwaltung/docker_mysql/templates/docker-compose.yml b/verwaltung/docker_mysql/templates/docker-compose.yml
index cd0603be8f0acd79786a3dbce9852b9e8e53ddf2..ad2b0fdb6ca7985cb397e61bdc58e41a375f6623 100644
--- a/verwaltung/docker_mysql/templates/docker-compose.yml
+++ b/verwaltung/docker_mysql/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:                                                                                                                                                            
 
-    image: mariadb:11.2.2                                                                                                                                                    
+    image: mariadb:11                                                                                                                                                 
     restart: always
     ports:
       - 127.0.0.1:3306:3306                                                                                      
diff --git a/verwaltung/docker_nextcloud/templates/docker-compose.yml b/verwaltung/docker_nextcloud/templates/docker-compose.yml
index a81e236a3daf071701edc1b9453036bbcd7f079b..b3ed764617be33d944a0f11383f1b99e9e7ab419 100644
--- a/verwaltung/docker_nextcloud/templates/docker-compose.yml
+++ b/verwaltung/docker_nextcloud/templates/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   redis:
 
-    image: redis:7.2.4
+    image: redis:7-alpine
     restart: always
     networks:
       - default
@@ -12,7 +12,7 @@ services:
 
   mysql:
 
-    image: mariadb:11.2.2
+    image: mariadb:11
     restart: always
     volumes:
       - /srv/nextcloud/db/:/var/lib/mysql
@@ -27,7 +27,7 @@ services:
 
   app:
 
-    image: nextcloud:28.0.1-apache
+    image: nextcloud:28-apache
     restart: always
     volumes:
       - /srv/nextcloud/data/:/var/www/html/