diff --git a/webserver/docker_mail/templates/docker-compose.yml b/webserver/docker_mail/templates/docker-compose.yml
index 7916c2021f28fd62e8630538522632a45f5e7b18..ebc42bdf924f51f67e3ff38b9bbd3b3d409df25c 100644
--- a/webserver/docker_mail/templates/docker-compose.yml
+++ b/webserver/docker_mail/templates/docker-compose.yml
@@ -15,7 +15,7 @@ services:
 
   # Certdumper
   certdumper:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}traefik-certdumper:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}traefik-certdumper:2.0.39
     restart: always
     environment:
       - DOMAIN={{ mailserver }}
@@ -26,7 +26,7 @@ services:
 
   # Core services
   front:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:2.0.39
     restart: always
     depends_on:
       - db
@@ -58,7 +58,7 @@ services:
       - 192.168.203.254
 
   resolver:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}unbound:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}unbound:2.0.39
     env_file: mailu.env
     restart: always
     networks:
@@ -66,7 +66,7 @@ services:
         ipv4_address: 192.168.203.254
 
   admin:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:2.0.39
     restart: always
     depends_on:
       - db
@@ -80,7 +80,7 @@ services:
       - 192.168.203.254
 
   imap:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:2.0.39
     restart: always
     depends_on:
       - db
@@ -94,7 +94,7 @@ services:
       - 192.168.203.254
 
   smtp:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:2.0.39
     restart: always
     depends_on:
       - db
@@ -110,7 +110,7 @@ services:
       - 192.168.203.254
 
   oletools:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}oletools:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}oletools:2.0.39
     hostname: oletools
     restart: always
     depends_on:
@@ -121,7 +121,7 @@ services:
       - 192.168.203.254
 
   antispam:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:2.0.39
     hostname: antispam
     restart: always
     depends_on:
@@ -156,7 +156,7 @@ services:
 
   # Optional mailu services: Webmail
   webmail:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}webmail:latest
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}webmail:2.0.39
     restart: always
     depends_on:
       - front
diff --git a/webserver/docker_mail/templates/mailu.env b/webserver/docker_mail/templates/mailu.env
index 208d611ee04c26ba56a5dddb9dbf4fdf3414e61d..8f9f7732a075c38789274e9eae50f7071720bc86 100644
--- a/webserver/docker_mail/templates/mailu.env
+++ b/webserver/docker_mail/templates/mailu.env
@@ -3,7 +3,7 @@
 ###################################
 
 # Set Version 
-MAILU_VERSION=2.0.37
+MAILU_VERSION=2.0.40
 
 # enable IPv6
 SUBNET6=fd00:dead:beef:25::/64