diff --git a/docker/infrastructure/mail/roundcube/docker-compose.yml b/docker/infrastructure/mail/roundcube/docker-compose.yml
index 904dcd0..78209c3 100644
--- a/docker/infrastructure/mail/roundcube/docker-compose.yml
+++ b/docker/infrastructure/mail/roundcube/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   roundcube:
-    image: roundcube/roundcubemail
+    image: roundcube/roundcubemail:1.6.11-apache
     container_name: roundcube
     networks:
       - default
@@ -11,7 +11,7 @@ services:
       - ROUNDCUBEMAIL_SMTP_SERVER=ssl://mail.vhaudiquet.fr
       - ROUNDCUBEMAIL_SMTP_PORT=465
     ports:
-      - "8000"
+      - "80"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.roundcube.rule=Host(`webmail.local`)"
diff --git a/docker/infrastructure/mail/stalwart/docker-compose.yml b/docker/infrastructure/mail/stalwart/docker-compose.yml
index eb553c3..8e048be 100644
--- a/docker/infrastructure/mail/stalwart/docker-compose.yml
+++ b/docker/infrastructure/mail/stalwart/docker-compose.yml
@@ -1,12 +1,12 @@
 services:
   stalwart:
-    image: stalwartlabs/mail-server:latest
+    image: stalwartlabs/stalwart:v0.13.2
     container_name: stalwart
     networks:
       - default
       - proxy
     volumes:
-      - stalwart_data:/opt/stalwart-mail
+      - stalwart_data:/opt/stalwart
     ports:
       - "25:25" # SMTP port
       - "465:465" # SMTPS port