diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 37ec14f..effdc87 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -12,7 +12,7 @@ services:
       GEOIPUPDATE_LICENSE_KEY: "${GEOIPUPDATE_LICENSE_KEY:?MaxMind GeoIP license key required}"
 
   postgresql:
-    image: docker.io/library/postgres:16-alpine
+    image: docker.io/library/postgres:${POSTGRES_TAG:-16.6-alpine}
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
@@ -33,7 +33,7 @@ services:
       - backend
 
   redis:
-    image: docker.io/library/redis:alpine
+    image: docker.io/library/redis:${REDIS_TAG:-7.4.2-alpine}
     command: --save 60 1 --loglevel warning
     restart: unless-stopped
     healthcheck:
@@ -110,7 +110,7 @@ services:
       context: ./docker/nginx
       dockerfile: Dockerfile
       args:
-        IMAGE: "nginxinc/nginx-unprivileged:1.27.2-bookworm"
+        IMAGE: "nginxinc/nginx-unprivileged:${NGINX_UNPRIVILEGED_TAG:-1.27.2-bookworm}"
         IMG_TITLE: "nginx-unprivileged-base23"
         IMAGE_VERSION: "COMPOSE"
     depends_on:
@@ -149,7 +149,7 @@ services:
       - frontend
 
   backup:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     restart: unless-stopped
     environment:
       PRE_COMMANDS: |-
@@ -182,7 +182,7 @@ services:
       - ./data/.lego:/var/lib/lego/backups:ro
 
   prune-backup:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     restart: unless-stopped
     environment:
       SKIP_INIT: "true"
@@ -196,7 +196,7 @@ services:
 
   # prüft ob backups noch in Ordnung sind, evtl. erweitern zum prüfen der Daten
   check-backup:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     restart: unless-stopped
     environment:
       #RUN_ON_STARTUP: "true"
@@ -210,7 +210,7 @@ services:
       - ./data/restic/ssh/:/run/secrets/.ssh:ro
 
   restore-cli:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     entrypoint: /entrypoint-restore
     environment:
       RESTIC_REPOSITORY: sftp://${RESTIC_REPO_USER:?Restic repository user is required}@${RESTIC_REPO_ADDRESS:?Restic repository address is requried}:${RESTIC_REPO_PORT:?Restic repository port is required}//backup
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 0594762..6a12040 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -12,7 +12,7 @@ services:
       GEOIPUPDATE_LICENSE_KEY: "${GEOIPUPDATE_LICENSE_KEY:?MaxMind GeoIP license key required}"
 
   postgresql:
-    image: docker.io/library/postgres:16-alpine
+    image: docker.io/library/postgres:${POSTGRES_TAG:-16.6-alpine}
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
@@ -33,7 +33,7 @@ services:
       - backend
 
   redis:
-    image: docker.io/library/redis:alpine
+    image: docker.io/library/redis:${REDIS_TAG:-7.4.2-alpine}
     command: --save 60 1 --loglevel warning
     restart: unless-stopped
     healthcheck:
@@ -116,7 +116,7 @@ services:
       - backend
 
   backup:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     restart: unless-stopped
     environment:
       PRE_COMMANDS: |-
@@ -149,7 +149,7 @@ services:
       - ./data/.lego:/var/lib/lego/backups:ro
 
   prune-backup:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     restart: unless-stopped
     environment:
       SKIP_INIT: "true"
@@ -162,7 +162,7 @@ services:
       - ./data/restic/ssh/:/run/secrets/.ssh:ro
 
   restore-cli:
-    image: registry.git.base23.de/base23/backup/resticker:0.17.0
+    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
     entrypoint: /entrypoint-restore
     environment:
       RESTIC_REPOSITORY: sftp://${RESTIC_REPO_USER:?Restic repository user is required}@${RESTIC_REPO_ADDRESS:?Restic repository address is requried}:${RESTIC_REPO_PORT:?Restic repository port is required}//backup
diff --git a/env.prod.template b/env.prod.template
index 033427d..65d8669 100644
--- a/env.prod.template
+++ b/env.prod.template
@@ -3,8 +3,12 @@
 PUBLIC_DOMAIN=sso.base23.de
 COMPOSE_PROJECT_NAME=sso-base23-de
 
-# Auhtentik version
+# Server Versions
 AUTHENTIK_TAG=2024.12.3
+POSTGRES_TAG=16.6-alpine
+REDIS_TAG=7.4.2-alpine
+RESTICKER_TAG=0.17.0
+NGINX_UNPRIVILEGED_TAG=1.27.2-bookworm
 
 # Error reporting & Logging
 AUTHENTIK_ERROR_REPORTING__ENABLED=true
diff --git a/env.test.template b/env.test.template
index 66e2396..109b9e2 100644
--- a/env.test.template
+++ b/env.test.template
@@ -3,8 +3,11 @@
 PUBLIC_DOMAIN=sso.test.base23.de
 COMPOSE_PROJECT_NAME=sso-base23-de
 
-# Auhtentik version
+# Server Versions
 AUTHENTIK_TAG=2024.12.3
+POSTGRES_TAG=16.6-alpine
+REDIS_TAG=7.4.2-alpine
+RESTICKER_TAG=0.17.0
 
 # Error reporting & Logging
 AUTHENTIK_ERROR_REPORTING__ENABLED=true