diff --git a/services/auth.yaml b/services/auth.yaml
index bd26706..de075a9 100644
--- a/services/auth.yaml
+++ b/services/auth.yaml
@@ -15,7 +15,7 @@ services:
 
   zitadel:
     restart: 'unless-stopped'
-    image: 'ghcr.io/zitadel/zitadel:latest'
+    image: 'ghcr.io/zitadel/zitadel:v2.24.10'
     environment:
       ZITADEL_DATABASE_COCKROACH_HOST: crdb
       ZITADEL_EXTERNALSECURE: true
diff --git a/services/mail.yaml b/services/mail.yaml
index bd608f5..f8eedc9 100644
--- a/services/mail.yaml
+++ b/services/mail.yaml
@@ -18,7 +18,7 @@ services:
       - ./mail/Proxyfile:/etc/caddy.d/mail:ro
 
   maddy:
-    image: foxcpp/maddy:latest
+    image: foxcpp/maddy:0.7
     secrets: [SMTP_PASSWORD]
     restart: unless-stopped
     depends_on:
@@ -39,7 +39,7 @@ services:
       - 993:993
 
   roundcube:
-    image: roundcube/roundcubemail:1.6.x-apache
+    image: roundcube/roundcubemail:1.6.5-fpm-alpine
     environment:
       ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.${DOMAIN}
       ROUNDCUBEMAIL_DEFAULT_PORT: 993