diff --git a/test/docker_mail/templates/docker-compose.yml b/test/docker_mail/templates/docker-compose.yml
index 7833da89a5e7507b8611f6b812bca76fc2b5c549..206766b56806f390eedc5b5f0d62bd1a87c31846 100644
--- a/test/docker_mail/templates/docker-compose.yml
+++ b/test/docker_mail/templates/docker-compose.yml
@@ -4,7 +4,6 @@ services:
 
   # External dependencies
   redis:
-    container_name: mailu-redis
     image: redis:alpine
     restart: always
     volumes:
@@ -16,7 +15,6 @@ services:
 
   # Certdumper
   certdumper:
-    container_name: mailu-certdumper
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}traefik-certdumper:${MAILU_VERSION:-2.0}
     restart: always
     environment:
@@ -28,7 +26,6 @@ services:
 
   # Core services
   front:
-    container_name: mailu-nginx
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-2.0}
     restart: always
     env_file: mailu.env
@@ -66,7 +63,6 @@ services:
       - 192.168.203.254
 
   resolver:
-    container_name: mailu-unbound
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-2.0}
     env_file: mailu.env
     restart: always
@@ -75,7 +71,6 @@ services:
         ipv4_address: 192.168.203.254
 
   admin:
-    container_name: mailu-admin
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-2.0}
     restart: always
     env_file: mailu.env
@@ -93,7 +88,6 @@ services:
       - 192.168.203.254
 
   imap:
-    container_name: mailu-dovecot
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-2.0}
     restart: always
     env_file: mailu.env
@@ -111,7 +105,6 @@ services:
       - 192.168.203.254
 
   smtp:
-    container_name: mailu-postfix
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-2.0}
     restart: always
     env_file: mailu.env
@@ -131,7 +124,6 @@ services:
       - 192.168.203.254
 
   oletools:
-    container_name: mailu-oletools
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}oletools:${MAILU_VERSION:-2.0}
     hostname: oletools
     restart: always
@@ -143,7 +135,6 @@ services:
       - 192.168.203.254
 
   antispam:
-    container_name: mailu-rspamd
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2.0}
     hostname: antispam
     restart: always
@@ -169,7 +160,6 @@ services:
   # Optional services
   # Webmail
   webmail:
-    container_name: mailu-roundcube
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}webmail:${MAILU_VERSION:-2.0}
     restart: always
     env_file: mailu.env
@@ -182,7 +172,6 @@ services:
 
   # Additional Services: mailman
   mailman-core:
-    container_name: mailman-core
     image: maxking/mailman-core:0.4
     restart: always
     env_file: mailu.env
@@ -212,7 +201,6 @@ services:
       - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }}
 
   mailman-nginx:
-    container_name: mailman-nginx
     image: nginx:1.19
     restart: always
     depends_on: