diff --git a/containers/adguard/docker-compose.yml b/containers/adguard/docker-compose.yml
index f782fa9..441316b 100644
--- a/containers/adguard/docker-compose.yml
+++ b/containers/adguard/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   adguard-service: #LIBREPORTAL|SERVICE_TAG_1|adguard-service
     container_name: adguard-service
-    image: adguard/adguardhome
+    image: adguard/adguardhome:latest #LIBREPORTAL|ADGUARD_VERSION_TAG|latest
     restart: unless-stopped
     hostname: adguard
     # GLUETUN_OFF_BEGIN
diff --git a/containers/authelia/docker-compose.yml b/containers/authelia/docker-compose.yml
index e6fec3e..e6b6b4e 100755
--- a/containers/authelia/docker-compose.yml
+++ b/containers/authelia/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   authelia-service: #LIBREPORTAL|SERVICE_TAG_1|authelia-service
     container_name: authelia-service
-    image: docker.io/authelia/authelia:latest
+    image: docker.io/authelia/authelia:latest #LIBREPORTAL|AUTHELIA_VERSION_TAG|latest
     restart: unless-stopped
     # GLUETUN_OFF_BEGIN
     ports:
diff --git a/containers/bookstack/docker-compose.yml b/containers/bookstack/docker-compose.yml
index 619cc96..2409b44 100755
--- a/containers/bookstack/docker-compose.yml
+++ b/containers/bookstack/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   bookstack-service: #LIBREPORTAL|SERVICE_TAG_1|bookstack-service
-    image: lscr.io/linuxserver/bookstack
+    image: lscr.io/linuxserver/bookstack:latest #LIBREPORTAL|BOOKSTACK_VERSION_TAG|latest
     container_name: bookstack
     environment:
       - PUID=1000
diff --git a/containers/dashy/docker-compose.yml b/containers/dashy/docker-compose.yml
index a63d37e..9c7945a 100755
--- a/containers/dashy/docker-compose.yml
+++ b/containers/dashy/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   dashy-service: #LIBREPORTAL|SERVICE_TAG_1|dashy-service
-    image: lissy93/dashy
+    image: lissy93/dashy:latest #LIBREPORTAL|DASHY_VERSION_TAG|latest
     container_name: dashy
     volumes:
       - SOCKET_DATA #LIBREPORTAL|SOCKET_TAG|SOCKET_DATA
diff --git a/containers/focalboard/docker-compose.yml b/containers/focalboard/docker-compose.yml
index 29ee121..06c3185 100755
--- a/containers/focalboard/docker-compose.yml
+++ b/containers/focalboard/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   focalboard-service: #LIBREPORTAL|SERVICE_TAG_1|focalboard-service
-    image: mattermost/focalboard
+    image: mattermost/focalboard:latest #LIBREPORTAL|FOCALBOARD_VERSION_TAG|latest
     container_name: focalboard-service
     # GLUETUN_OFF_BEGIN
     ports:
diff --git a/containers/gitea/docker-compose.yml b/containers/gitea/docker-compose.yml
index f95db17..aae7373 100755
--- a/containers/gitea/docker-compose.yml
+++ b/containers/gitea/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   gitea-service: #LIBREPORTAL|SERVICE_TAG_1|gitea-service
     container_name: gitea-service
-    image: gitea/gitea:latest
+    image: gitea/gitea:latest #LIBREPORTAL|GITEA_VERSION_TAG|latest
     restart: unless-stopped
     # GLUETUN_OFF_BEGIN
     depends_on:
diff --git a/containers/gluetun/docker-compose.yml b/containers/gluetun/docker-compose.yml
index 4e3fd49..77fc5ab 100644
--- a/containers/gluetun/docker-compose.yml
+++ b/containers/gluetun/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   gluetun-service: #LIBREPORTAL|SERVICE_TAG_1|gluetun-service
     container_name: gluetun-service
-    image: qmcgaw/gluetun:latest
+    image: qmcgaw/gluetun:latest #LIBREPORTAL|GLUETUN_VERSION_TAG|latest
     restart: unless-stopped
     hostname: gluetun
     cap_add:
diff --git a/containers/grafana/docker-compose.yml b/containers/grafana/docker-compose.yml
index 7c518e9..bdd2712 100755
--- a/containers/grafana/docker-compose.yml
+++ b/containers/grafana/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   grafana-service: #LIBREPORTAL|SERVICE_TAG_1|grafana-service
-    image: grafana/grafana-enterprise
+    image: grafana/grafana-enterprise:latest #LIBREPORTAL|GRAFANA_VERSION_TAG|latest
     container_name: grafana-service
     restart: unless-stopped
     environment:
diff --git a/containers/headscale/docker-compose.yml b/containers/headscale/docker-compose.yml
index 2cbd741..8e53adc 100755
--- a/containers/headscale/docker-compose.yml
+++ b/containers/headscale/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   headscale-service: #LIBREPORTAL|SERVICE_TAG_1|headscale-service
     container_name: headscale-service
-    image: headscale/headscale:latest
+    image: headscale/headscale:latest #LIBREPORTAL|HEADSCALE_VERSION_TAG|latest
     volumes:
       - ./config:/etc/headscale/
       - ./data:/var/lib/headscale
diff --git a/containers/invidious/docker-compose.yml b/containers/invidious/docker-compose.yml
index 2bbb4a2..7e681a4 100644
--- a/containers/invidious/docker-compose.yml
+++ b/containers/invidious/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   invidious-service: #LIBREPORTAL|SERVICE_TAG_1|invidious-service
     container_name: invidious-service
-    image: quay.io/invidious/invidious:latest
+    image: quay.io/invidious/invidious:latest #LIBREPORTAL|INVIDIOUS_VERSION_TAG|latest
     restart: unless-stopped
     depends_on:
       - invidious-db
diff --git a/containers/ipinfo/docker-compose.yml b/containers/ipinfo/docker-compose.yml
index c79384a..b9182eb 100755
--- a/containers/ipinfo/docker-compose.yml
+++ b/containers/ipinfo/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   ipinfo-service: #LIBREPORTAL|SERVICE_TAG_1|ipinfo-service
     container_name: ipinfo-service
-    image: peterdavehello/ipinfo.tw:latest
+    image: peterdavehello/ipinfo.tw:latest #LIBREPORTAL|IPINFO_VERSION_TAG|latest
     restart: unless-stopped
     # GLUETUN_OFF_BEGIN
     ports:
diff --git a/containers/jellyfin/docker-compose.yml b/containers/jellyfin/docker-compose.yml
index f62ad95..10224bf 100755
--- a/containers/jellyfin/docker-compose.yml
+++ b/containers/jellyfin/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   jellyfin-service: #LIBREPORTAL|SERVICE_TAG_1|jellyfin-service
-    image: jellyfin/jellyfin
+    image: jellyfin/jellyfin:latest #LIBREPORTAL|JELLYFIN_VERSION_TAG|latest
     container_name: jellyfin-service
     # GLUETUN_OFF_BEGIN
     ports:
diff --git a/containers/jitsimeet/docker-compose.yml b/containers/jitsimeet/docker-compose.yml
index 553da92..2a34599 100644
--- a/containers/jitsimeet/docker-compose.yml
+++ b/containers/jitsimeet/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     # Frontend
     jitsimeet-service: #LIBREPORTAL|SERVICE_TAG_1|jitsimeet-service
         container_name: jitsimeet-service
-        image: jitsi/web:stable
+        image: jitsi/web:stable #LIBREPORTAL|JITSIMEET_VERSION_TAG|stable
         volumes:
             - ${CONFIG}/web:/config
             - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts
diff --git a/containers/libreportal_catalog/docker-compose.yml b/containers/libreportal_catalog/docker-compose.yml
index 7fd7002..48e8a47 100644
--- a/containers/libreportal_catalog/docker-compose.yml
+++ b/containers/libreportal_catalog/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   libreportal-catalog-service: #LIBREPORTAL|SERVICE_TAG_1|libreportal-catalog-service
     container_name: libreportal-catalog-service
-    image: nginx:alpine
+    image: nginx:alpine #LIBREPORTAL|LIBREPORTAL_CATALOG_VERSION_TAG|alpine
     restart: unless-stopped
     hostname: libreportal-catalog
     # GLUETUN_OFF_BEGIN
diff --git a/containers/linkding/docker-compose.yml b/containers/linkding/docker-compose.yml
index 5259013..ea2adf4 100755
--- a/containers/linkding/docker-compose.yml
+++ b/containers/linkding/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     # Linkding Bookmark Manager
     linkding-service: #LIBREPORTAL|SERVICE_TAG_1|linkding-service
         container_name: linkding-service
-        image: sissbruecker/linkding:latest
+        image: sissbruecker/linkding:latest #LIBREPORTAL|LINKDING_VERSION_TAG|latest
         ports:
             - "PORTS_DATA_1" #LIBREPORTAL|PORTS_TAG_1|PORTS_DATA_1
         volumes:
diff --git a/containers/mastodon/docker-compose.yml b/containers/mastodon/docker-compose.yml
index be6543c..235a3f9 100755
--- a/containers/mastodon/docker-compose.yml
+++ b/containers/mastodon/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
     mastodon-service: #LIBREPORTAL|SERVICE_TAG_1|mastodon-service
         container_name: mastodon-service
-        image: tootsuite/mastodon:v4.2.0
+        image: tootsuite/mastodon:v4.2.0 #LIBREPORTAL|MASTODON_VERSION_TAG|v4.2.0
         ports:
             - "PORTS_DATA_1" #LIBREPORTAL|PORTS_TAG_1|PORTS_DATA_1
             - "PORTS_DATA_2" #LIBREPORTAL|PORTS_TAG_2|PORTS_DATA_2
diff --git a/containers/moneyapp/docker-compose.yml b/containers/moneyapp/docker-compose.yml
index 18b3811..21775ec 100644
--- a/containers/moneyapp/docker-compose.yml
+++ b/containers/moneyapp/docker-compose.yml
@@ -6,7 +6,7 @@ services:
   moneyapp-service: #LIBREPORTAL|SERVICE_TAG_1|moneyapp-service
     container_name: moneyapp-service
     build: .
-    image: moneyapp:latest
+    image: moneyapp:latest #LIBREPORTAL|MONEYAPP_VERSION_TAG|latest
     restart: unless-stopped
     hostname: moneyapp
     # GLUETUN_OFF_BEGIN
diff --git a/containers/navidrome/docker-compose.yml b/containers/navidrome/docker-compose.yml
index 47b76fd..4a6aa52 100644
--- a/containers/navidrome/docker-compose.yml
+++ b/containers/navidrome/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     # Navidrome Music Server
     navidrome-service: #LIBREPORTAL|SERVICE_TAG_1|navidrome-service
         container_name: navidrome-service
-        image: deluan/navidrome:latest
+        image: deluan/navidrome:latest #LIBREPORTAL|NAVIDROME_VERSION_TAG|latest
         # GLUETUN_OFF_BEGIN
         ports:
             - "PORTS_DATA_1" #LIBREPORTAL|PORTS_TAG_1|PORTS_DATA_1
diff --git a/containers/nextcloud/docker-compose.yml b/containers/nextcloud/docker-compose.yml
index 4ca8212..20a6964 100644
--- a/containers/nextcloud/docker-compose.yml
+++ b/containers/nextcloud/docker-compose.yml
@@ -9,7 +9,7 @@ services:
   # automatically on first boot when the NEXTCLOUD_ADMIN_USER + MYSQL_* env
   # vars are set, so no user wizard.
   nextcloud-service: #LIBREPORTAL|SERVICE_TAG_1|nextcloud-service
-    image: nextcloud:31-fpm-alpine
+    image: nextcloud:31-fpm-alpine #LIBREPORTAL|NEXTCLOUD_VERSION_TAG|31-fpm-alpine
     container_name: nextcloud-service
     environment:
       - TZ=TIMEZONE_DATA #LIBREPORTAL|TIMEZONE_TAG|TIMEZONE_DATA
diff --git a/containers/ollama/docker-compose.yml b/containers/ollama/docker-compose.yml
index 356ff63..32cf2b5 100755
--- a/containers/ollama/docker-compose.yml
+++ b/containers/ollama/docker-compose.yml
@@ -35,7 +35,7 @@ services:
 
   ollama-service: #LIBREPORTAL|SERVICE_TAG_2|ollama-service
     container_name: ollama-service
-    image: ollama/ollama:latest
+    image: ollama/ollama:latest #LIBREPORTAL|OLLAMA_VERSION_TAG|latest
     restart: unless-stopped
     hostname: ollama
     # GLUETUN_OFF_BEGIN
diff --git a/containers/onlyoffice/docker-compose.yml b/containers/onlyoffice/docker-compose.yml
index a1f2331..2f8d02a 100755
--- a/containers/onlyoffice/docker-compose.yml
+++ b/containers/onlyoffice/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   onlyoffice-service: #LIBREPORTAL|SERVICE_TAG_1|onlyoffice-service
     container_name: onlyoffice-service
-    image: onlyoffice/documentserver:latest
+    image: onlyoffice/documentserver:latest #LIBREPORTAL|ONLYOFFICE_VERSION_TAG|latest
     restart: unless-stopped
     hostname: onlyoffice
     stdin_open: true
diff --git a/containers/owncloud/docker-compose.yml b/containers/owncloud/docker-compose.yml
index 05fb00e..488055d 100755
--- a/containers/owncloud/docker-compose.yml
+++ b/containers/owncloud/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 services:
   owncloud-service: #LIBREPORTAL|SERVICE_TAG_1|owncloud-service
     container_name: owncloud-service
-    image: owncloud/server:latest
+    image: owncloud/server:latest #LIBREPORTAL|OWNCLOUD_VERSION_TAG|latest
     restart: unless-stopped
     hostname: owncloud
     depends_on:
diff --git a/containers/pihole/docker-compose.yml b/containers/pihole/docker-compose.yml
index 4258987..2cd4586 100755
--- a/containers/pihole/docker-compose.yml
+++ b/containers/pihole/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   pihole-service: #LIBREPORTAL|SERVICE_TAG_1|pihole-service
     container_name: pihole-service
-    image: cbcrowe/pihole-unbound:latest
+    image: cbcrowe/pihole-unbound:latest #LIBREPORTAL|PIHOLE_VERSION_TAG|latest
     restart: unless-stopped
     hostname: pihole
     # GLUETUN_OFF_BEGIN
diff --git a/containers/prometheus/docker-compose.yml b/containers/prometheus/docker-compose.yml
index e9956bc..4e12cb6 100755
--- a/containers/prometheus/docker-compose.yml
+++ b/containers/prometheus/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   prometheus-service: #LIBREPORTAL|SERVICE_TAG_1|prometheus-service
     container_name: prometheus-service
-    image: prom/prometheus
+    image: prom/prometheus:latest #LIBREPORTAL|PROMETHEUS_VERSION_TAG|latest
     restart: unless-stopped
     hostname: prometheus
     extra_hosts:
diff --git a/containers/searxng/docker-compose.yml b/containers/searxng/docker-compose.yml
index e48909b..002b859 100755
--- a/containers/searxng/docker-compose.yml
+++ b/containers/searxng/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   searxng-service: #LIBREPORTAL|SERVICE_TAG_1|searxng-service
     container_name: searxng-service
-    image: searxng/searxng:latest
+    image: searxng/searxng:latest #LIBREPORTAL|SEARXNG_VERSION_TAG|latest
     restart: unless-stopped
     hostname: searxng
     # GLUETUN_OFF_BEGIN
diff --git a/containers/speedtest/docker-compose.yml b/containers/speedtest/docker-compose.yml
index 969b841..a09b38e 100644
--- a/containers/speedtest/docker-compose.yml
+++ b/containers/speedtest/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   speedtest-service: #LIBREPORTAL|SERVICE_TAG_1|speedtest-service
     container_name: speedtest-service
-    image: adolfintel/speedtest
+    image: adolfintel/speedtest:latest #LIBREPORTAL|SPEEDTEST_VERSION_TAG|latest
     restart: unless-stopped
     hostname: speedtest
     environment:
diff --git a/containers/traefik/docker-compose.yml b/containers/traefik/docker-compose.yml
index 75cd173..6fd3b6d 100644
--- a/containers/traefik/docker-compose.yml
+++ b/containers/traefik/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   traefik-service: #LIBREPORTAL|SERVICE_TAG_1|traefik-service
     container_name: traefik-service
-    image: traefik:latest
+    image: traefik:latest #LIBREPORTAL|TRAEFIK_VERSION_TAG|latest
     restart: unless-stopped
     hostname: traefik
     ports:
diff --git a/containers/trilium/docker-compose.yml b/containers/trilium/docker-compose.yml
index d8e4d7d..ced8eb3 100755
--- a/containers/trilium/docker-compose.yml
+++ b/containers/trilium/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   trilium-service: #LIBREPORTAL|SERVICE_TAG_1|trilium-service
     container_name: trilium-service
-    image: zadam/trilium:latest
+    image: zadam/trilium:latest #LIBREPORTAL|TRILIUM_VERSION_TAG|latest
     restart: unless-stopped
     hostname: trilium
     # GLUETUN_OFF_BEGIN
diff --git a/containers/trivy/docker-compose.yml b/containers/trivy/docker-compose.yml
index 172e47f..992bff2 100644
--- a/containers/trivy/docker-compose.yml
+++ b/containers/trivy/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   trivy-service: #LIBREPORTAL|SERVICE_TAG_1|trivy-service
     container_name: trivy-service
-    image: aquasec/trivy:latest
+    image: aquasec/trivy:latest #LIBREPORTAL|TRIVY_VERSION_TAG|latest
     restart: unless-stopped
     # Keep the container process ALIVE even when the vuln DB can't be fetched.
     # `trivy server` FATAL-exits if it can't download the DB on first boot (no
diff --git a/containers/unbound/docker-compose.yml b/containers/unbound/docker-compose.yml
index 98171b6..60364de 100755
--- a/containers/unbound/docker-compose.yml
+++ b/containers/unbound/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   unbound-service: #LIBREPORTAL|SERVICE_TAG_1|unbound-service
     container_name: unbound-service
-    image: mvance/unbound:latest
+    image: mvance/unbound:latest #LIBREPORTAL|UNBOUND_VERSION_TAG|latest
     restart: unless-stopped
     hostname: unbound
     # GLUETUN_OFF_BEGIN
diff --git a/containers/vaultwarden/docker-compose.yml b/containers/vaultwarden/docker-compose.yml
index 839192d..2fc4773 100755
--- a/containers/vaultwarden/docker-compose.yml
+++ b/containers/vaultwarden/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   vaultwarden-service: #LIBREPORTAL|SERVICE_TAG_1|vaultwarden-service
     container_name: vaultwarden-service
-    image: vaultwarden/server:latest
+    image: vaultwarden/server:latest #LIBREPORTAL|VAULTWARDEN_VERSION_TAG|latest
     restart: unless-stopped
     hostname: vaultwarden
     # GLUETUN_OFF_BEGIN
diff --git a/containers/wireguard/docker-compose.yml b/containers/wireguard/docker-compose.yml
index 00be91d..00de966 100755
--- a/containers/wireguard/docker-compose.yml
+++ b/containers/wireguard/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   wireguard-service: #LIBREPORTAL|SERVICE_TAG_1|wireguard-service
     container_name: wireguard-service
-    image: ghcr.io/wg-easy/wg-easy:latest
+    image: ghcr.io/wg-easy/wg-easy:latest #LIBREPORTAL|WIREGUARD_VERSION_TAG|latest
     restart: unless-stopped
     hostname: wireguard
     environment: