diff --git a/docker-compose/httpd/docker-compose.yml.j2 b/docker-compose/httpd/docker-compose.yml.j2
index 275bdbb8..4e1e4d33 100644
--- a/docker-compose/httpd/docker-compose.yml.j2
+++ b/docker-compose/httpd/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '3'
 services:
   httpd-registry:
     container_name: "httpd-registry"
-    image: httpd:2.4.57
+    image: "httpd:2.4.57"
     restart: always
     volumes:
       - uploads:/usr/local/apache2/htdocs/
@@ -14,7 +14,7 @@ services:
 
   python-api-server:
     container_name: httpd-api
-    image: registry.mgrote.net/python-api-server:latest
+    image: "registry.mgrote.net/python-api-server:latest"
     restart: always
     ports:
       - "5040:5000"
diff --git a/docker-compose/mail-relay/docker-compose.yml.j2 b/docker-compose/mail-relay/docker-compose.yml.j2
index 47dad430..5190fe60 100644
--- a/docker-compose/mail-relay/docker-compose.yml.j2
+++ b/docker-compose/mail-relay/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
     postfix:
-      image: registry.mgrote.net/postfix:master
+      image: "registry.mgrote.net/postfix:master"
       container_name: mail-relay
       restart: always
       labels:
diff --git a/docker-compose/miniflux/docker-compose.yml.j2 b/docker-compose/miniflux/docker-compose.yml.j2
index fdce824e..51db9194 100644
--- a/docker-compose/miniflux/docker-compose.yml.j2
+++ b/docker-compose/miniflux/docker-compose.yml.j2
@@ -3,7 +3,7 @@ services:
 ######## Miniflux ########
   miniflux:
     container_name: "mf-frontend"
-    image: ghcr.io/miniflux/miniflux:2.0.51
+    image: "ghcr.io/miniflux/miniflux:2.0.51"
     restart: always
     depends_on:
       - db
@@ -36,7 +36,7 @@ services:
 ######## PostGreSQL ########
   db:
     container_name: "mf-db"
-    image: postgres:13.12:13.12
+    image: "postgres:16.0"
     restart: always
     environment:
       POSTGRES_USER: miniflux
@@ -61,7 +61,7 @@ services:
       MF_API_URL: https://miniflux.mgrote.net/v1
       MF_SLEEP: 600
       #MF_DEBUG: 1
-    image: registry.mgrote.net/miniflux-filter:latest
+    image: "registry.mgrote.net/miniflux-filter:latest"
     volumes:
       - ./filter.txt:/data/filter.txt
     networks:
diff --git a/docker-compose/navidrome/docker-compose.yml.j2 b/docker-compose/navidrome/docker-compose.yml.j2
index f9cf7b76..fd06040c 100644
--- a/docker-compose/navidrome/docker-compose.yml.j2
+++ b/docker-compose/navidrome/docker-compose.yml.j2
@@ -3,7 +3,7 @@ services:
 ######## navidrome-mg ########
   navidrome-mg:
     container_name: "navidrome-mg"
-    image: deluan/navidrome:0.51.0@sha256:efd0b899e74db3e5063a8c773cfe7d103b0b61ce7021a50f2f9da189591b9dc7
+    image: "deluan/navidrome:0.51.0@sha256:efd0b899e74db3e5063a8c773cfe7d103b0b61ce7021a50f2f9da189591b9dc7"
     restart: always
     environment:
       ND_LOGLEVEL: info
diff --git a/docker-compose/nextcloud/docker-compose.yml.j2 b/docker-compose/nextcloud/docker-compose.yml.j2
index 918d2890..8f0ed5f6 100644
--- a/docker-compose/nextcloud/docker-compose.yml.j2
+++ b/docker-compose/nextcloud/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '3.3'
 services:
 ######## Datenbank ########
   nextcloud-db:
-    image: mariadb:10.6.15
+    image: "mariadb:10.6.15"
     container_name: nextcloud-db
     command: --transaction-isolation=READ-COMMITTED --log-bin=ROW --innodb_read_only_compressed=OFF
     restart: unless-stopped
@@ -30,7 +30,7 @@ services:
 
 ######## Redis ########
   nextcloud-redis:
-    image: redis:70.15
+    image: "redis:7.0.15"
     container_name: nextcloud-redis
     hostname: nextcloud-redis
     networks:
@@ -43,7 +43,7 @@ services:
 ######## cron ########
   nextcloud-cron:
     container_name: nextcloud-cron
-    image: registry.mgrote.net/nextcloud-cronjob:master
+    image: "registry.mgrote.net/nextcloud-cronjob:master"
     restart: unless-stopped
     network_mode: none
     depends_on:
@@ -59,7 +59,7 @@ services:
 
 ######## Nextcloud ########
   nextcloud-app:
-    image: nextcloud:27.1.5
+    image: "nextcloud:27.1.5"
     container_name: nextcloud-app
     restart: unless-stopped
     depends_on:
diff --git a/docker-compose/photoprism/docker-compose.yml.j2 b/docker-compose/photoprism/docker-compose.yml.j2
index dca4ed66..56eb81c4 100644
--- a/docker-compose/photoprism/docker-compose.yml.j2
+++ b/docker-compose/photoprism/docker-compose.yml.j2
@@ -19,7 +19,7 @@ version: '3.5'
 services:
   photoprism:
     # Use photoprism/photoprism:preview instead for testing preview builds:
-    image: photoprism/photoprism:latest
+    image: "photoprism/photoprism:231128"
     container_name: photoprism-frontend
     restart: always
     security_opt:
@@ -66,7 +66,7 @@ services:
       com.centurylinklabs.watchtower.depends-on: photoprism-db
 
   mariadb:
-    image: mariadb:10.6.15:10
+    image: "mariadb:10.6.15"
     container_name: photoprism-db
     restart: always
     security_opt:
diff --git a/docker-compose/registry/docker-compose.yml.j2 b/docker-compose/registry/docker-compose.yml.j2
index f72add59..e603d584 100644
--- a/docker-compose/registry/docker-compose.yml.j2
+++ b/docker-compose/registry/docker-compose.yml.j2
@@ -3,7 +3,7 @@ services:
   oci-registry:
     restart: always
     container_name: oci-registry
-    image: registry:2.8.2
+    image: "registry:2.8.2"
     volumes:
       - oci:/var/lib/registry
       - ./htpasswd:/auth/htpasswd
@@ -51,7 +51,7 @@ services:
     # docker pull registry.mgrote.net/myfirstimage
 
   oci-registry-redis:
-    image: redis:7.0.15
+    image: "redis:7.0.15"
     container_name: oci-registry-redis
     networks:
       - intern
@@ -65,7 +65,7 @@ services:
   oci-registry-ui:
     restart: always
     # url: registry.mgrote.net/ui/index.html
-    image: joxit/docker-registry-ui:latest
+    image: "joxit/docker-registry-ui:2.5.5"
     container_name: oci-registry-ui
     environment:
       DELETE_IMAGES: true
diff --git a/docker-compose/routeros-config-export/docker-compose.yml b/docker-compose/routeros-config-export/docker-compose.yml
index f8996f16..cd1043c4 100644
--- a/docker-compose/routeros-config-export/docker-compose.yml
+++ b/docker-compose/routeros-config-export/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   routeros-config-export:
     container_name: routeros-config-export
     restart: always
-    image: registry.mgrote.net/routeros-config-export:master@sha256:2a23f6ae21b55ac39a8ffe5dcb6d3441473e02c6402d68d85e90abfa1ff634cb
+    image: "registry.mgrote.net/routeros-config-export:master@sha256:2a23f6ae21b55ac39a8ffe5dcb6d3441473e02c6402d68d85e90abfa1ff634cb"
     volumes:
       - ./key_rb5009:/key_rb5009:ro
       - ./key_hex:/key_hex:ro
diff --git a/docker-compose/statping-ng/docker-compose.yml.j2 b/docker-compose/statping-ng/docker-compose.yml.j2
index d1343b0e..318d30f1 100644
--- a/docker-compose/statping-ng/docker-compose.yml.j2
+++ b/docker-compose/statping-ng/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '2.3'
 services:
   statping:
     container_name: statping
-    image: adamboutcher/statping-ng:latest
+    image: "adamboutcher/statping-ng:latest"
     restart: always
     volumes:
       - statping_data:/app
diff --git a/docker-compose/traefik/docker-compose.yml.j2 b/docker-compose/traefik/docker-compose.yml.j2
index 33da9700..9db8a79f 100644
--- a/docker-compose/traefik/docker-compose.yml.j2
+++ b/docker-compose/traefik/docker-compose.yml.j2
@@ -3,7 +3,7 @@ services:
 ######## traefik ########
   traefik:
     container_name: traefik
-    image: traefik:2.10
+    image: "traefik:2.10"
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -25,7 +25,7 @@ services:
 ######## nforwardauth ########
   nforwardauth:
     restart: always
-    image: nosduco/nforwardauth:v1.3.4
+    image: "nosduco/nforwardauth:v1.3.4"
     container_name: traefik-nforwardauth
     environment:
       TOKEN_SECRET: {{ lookup('keepass', 'nforwardauth_token_secret', 'password') }}
diff --git a/docker-compose/unifi-network-application/docker-compose.yml.j2 b/docker-compose/unifi-network-application/docker-compose.yml.j2
index c21d3f43..10175a99 100644
--- a/docker-compose/unifi-network-application/docker-compose.yml.j2
+++ b/docker-compose/unifi-network-application/docker-compose.yml.j2
@@ -2,7 +2,7 @@
 version: "2.1"
 services:
   unifi-network-application:
-    image: lscr.io/linuxserver/unifi-network-application:8.0.28-ls27
+    image: "lscr.io/linuxserver/unifi-network-application:8.0.28-ls27"
     container_name: unifi-network-application
     environment:
       PUID: 1000
@@ -41,7 +41,7 @@ services:
     # 1. mongo
     # 2. db.getSiblingDB("unifidb").createUser({user: "unifiuser", pwd: "GEHEIM", roles: [{role: "dbOwner", db: "unifidb"}, {role: "dbOwner", db: "unifidb_stat"}]});
     # https://discourse.linuxserver.io/t/cant-connect-to-mongodb-for-unifi-network-application/8166
-    image: docker.io/mongo:6.0.13
+    image: "docker.io/mongo:6.0.13"
     container_name: unifi-db
     volumes:
       - db-data:/data/db
diff --git a/docker-compose/watchtower/docker-compose.yml.j2 b/docker-compose/watchtower/docker-compose.yml.j2
index 5d217722..707ad252 100644
--- a/docker-compose/watchtower/docker-compose.yml.j2
+++ b/docker-compose/watchtower/docker-compose.yml.j2
@@ -3,7 +3,7 @@ services:
   watchtower:
     restart: always
     container_name: watchtower
-    image: containrrr/watchtower:1.7.1@sha256:6dd50763bbd632a83cb154d5451700530d1e44200b268a4e9488fefdfcf2b038
+    image: "containrrr/watchtower:1.7.1@sha256:6dd50763bbd632a83cb154d5451700530d1e44200b268a4e9488fefdfcf2b038"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
diff --git a/docker-compose/wiki/docker-compose.yml.j2 b/docker-compose/wiki/docker-compose.yml.j2
index 929b838e..b163b4d5 100644
--- a/docker-compose/wiki/docker-compose.yml.j2
+++ b/docker-compose/wiki/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '3'
 services:
   wiki-webserver:
     container_name: wiki-webserver
-    image: httpd:2.4.58@sha256:ba846154ade27292d216cce2d21f1c7e589f3b66a4a643bff0cdd348efd17aa3
+    image: "httpd:2.4.57@sha256:5201524443f9026753e25540a44495b7f6e6ca706c71208bb3a5f2daac205c31"
     restart: always
     networks:
       - traefik
diff --git a/docker-compose/woodpecker/docker-compose.yml.j2 b/docker-compose/woodpecker/docker-compose.yml.j2
index 8794dad1..94f73f2e 100644
--- a/docker-compose/woodpecker/docker-compose.yml.j2
+++ b/docker-compose/woodpecker/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
   woodpecker-server:
     restart: always
     container_name: woodpecker-server
-    image: woodpeckerci/woodpecker-server:v2.2.2
+    image: "woodpeckerci/woodpecker-server:v2.2.2"
     ports:
       - 8000:8000
     volumes:
@@ -43,7 +43,7 @@ services:
 
   woodpecker-agent:
     container_name: woodpecker-agent
-    image: woodpeckerci/woodpecker-agent:v2.2.2
+    image: "woodpeckerci/woodpecker-agent:v2.2.1"
     command: agent
     restart: always
     depends_on:
diff --git a/group_vars/gitea.yml b/group_vars/gitea.yml
index 5b3ff852..9c8e5726 100644
--- a/group_vars/gitea.yml
+++ b/group_vars/gitea.yml
@@ -61,11 +61,10 @@ gitea_repo_indexer_enabled: true
 
 gitea_mailer_enabled: true
 gitea_mailer_skip_verify: false
-gitea_mailer_tls_enabled: true
-gitea_mailer_host: smtp.strato.de:465
-gitea_mailer_from: info@mgrote.net
-gitea_mailer_user: "info@mgrote.net"
-gitea_mailer_password: "{{ lookup('keepass', 'strato_smtp_password', 'password') }}"
+gitea_mailer_tls_enabled: false
+gitea_mailer_host: docker10.mgrote.net:1025
+gitea_mailer_from: gitea@mgrote.net
+gitea_mailer_user: "gitea@mgrote.net"
 gitea_mailer_type: smtp
 
 gitea_default_branch: 'master'