diff --git a/tests/compose/core/docker-compose.yml b/tests/compose/core/docker-compose.yml
index 47c5f179..397000a6 100644
--- a/tests/compose/core/docker-compose.yml
+++ b/tests/compose/core/docker-compose.yml
@@ -22,23 +22,14 @@ services:
       driver: json-file
     ports:
       - "127.0.0.1:80:80"
-      - "::1:80:80"
       - "127.0.0.1:443:443"
-      - "::1:443:443"
       - "127.0.0.1:25:25"
-      - "::1:25:25"
       - "127.0.0.1:465:465"
-      - "::1:465:465"
       - "127.0.0.1:587:587"
-      - "::1:587:587"
       - "127.0.0.1:110:110"
-      - "::1:110:110"
       - "127.0.0.1:995:995"
-      - "::1:995:995"
       - "127.0.0.1:143:143"
-      - "::1:143:143"
       - "127.0.0.1:993:993"
-      - "::1:993:993"
     volumes:
       - "/mailu/certs:/certs"
 
diff --git a/tests/compose/core/mailu.env b/tests/compose/core/mailu.env
index b243adcc..dabd523f 100644
--- a/tests/compose/core/mailu.env
+++ b/tests/compose/core/mailu.env
@@ -18,12 +18,12 @@
 #VERSION=master
 
 # Set to a randomly generated 16 bytes string
-SECRET_KEY=DY8PPWQXCFV84N4K
+SECRET_KEY=HGZCYGVI6FVG31HS
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
-# PUBLIC_IPV6= ::1 (default: ::1)
+# PUBLIC_IPV6=  (default: ::1)
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -35,7 +35,7 @@ HOSTNAMES=mail.mailu.io
 POSTMASTER=admin
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-TLS_FLAVOR=letsencrypt
+TLS_FLAVOR=cert
 
 # Authentication rate limit (per source IP address)
 AUTH_RATELIMIT=10/minute;1000/hour 
diff --git a/tests/compose/fetchmail/docker-compose.yml b/tests/compose/fetchmail/docker-compose.yml
index 6612dc25..6b1be40e 100644
--- a/tests/compose/fetchmail/docker-compose.yml
+++ b/tests/compose/fetchmail/docker-compose.yml
@@ -22,23 +22,14 @@ services:
       driver: json-file
     ports:
       - "127.0.0.1:80:80"
-      - "::1:80:80"
       - "127.0.0.1:443:443"
-      - "::1:443:443"
       - "127.0.0.1:25:25"
-      - "::1:25:25"
       - "127.0.0.1:465:465"
-      - "::1:465:465"
       - "127.0.0.1:587:587"
-      - "::1:587:587"
       - "127.0.0.1:110:110"
-      - "::1:110:110"
       - "127.0.0.1:995:995"
-      - "::1:995:995"
       - "127.0.0.1:143:143"
-      - "::1:143:143"
       - "127.0.0.1:993:993"
-      - "::1:993:993"
     volumes:
       - "/mailu/certs:/certs"
 
diff --git a/tests/compose/fetchmail/mailu.env b/tests/compose/fetchmail/mailu.env
index 4cea36f7..ef78508b 100644
--- a/tests/compose/fetchmail/mailu.env
+++ b/tests/compose/fetchmail/mailu.env
@@ -18,12 +18,12 @@
 #VERSION=master
 
 # Set to a randomly generated 16 bytes string
-SECRET_KEY=PDK7N9UC7FDQ2UWE
+SECRET_KEY=JS48Q9KE3B6T97E6
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
-# PUBLIC_IPV6= ::1 (default: ::1)
+# PUBLIC_IPV6=  (default: ::1)
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -35,7 +35,7 @@ HOSTNAMES=mail.mailu.io
 POSTMASTER=admin
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-TLS_FLAVOR=letsencrypt
+TLS_FLAVOR=cert
 
 # Authentication rate limit (per source IP address)
 AUTH_RATELIMIT=10/minute;1000/hour 
diff --git a/tests/compose/filters/docker-compose.yml b/tests/compose/filters/docker-compose.yml
index 31e62e72..4fbda49a 100644
--- a/tests/compose/filters/docker-compose.yml
+++ b/tests/compose/filters/docker-compose.yml
@@ -22,23 +22,14 @@ services:
       driver: json-file
     ports:
       - "127.0.0.1:80:80"
-      - "::1:80:80"
       - "127.0.0.1:443:443"
-      - "::1:443:443"
       - "127.0.0.1:25:25"
-      - "::1:25:25"
       - "127.0.0.1:465:465"
-      - "::1:465:465"
       - "127.0.0.1:587:587"
-      - "::1:587:587"
       - "127.0.0.1:110:110"
-      - "::1:110:110"
       - "127.0.0.1:995:995"
-      - "::1:995:995"
       - "127.0.0.1:143:143"
-      - "::1:143:143"
       - "127.0.0.1:993:993"
-      - "::1:993:993"
     volumes:
       - "/mailu/certs:/certs"
 
diff --git a/tests/compose/filters/mailu.env b/tests/compose/filters/mailu.env
index 15fae1fc..ab97e191 100644
--- a/tests/compose/filters/mailu.env
+++ b/tests/compose/filters/mailu.env
@@ -18,12 +18,12 @@
 #VERSION=master
 
 # Set to a randomly generated 16 bytes string
-SECRET_KEY=IUFE7Z57URZH1ZM1
+SECRET_KEY=11H6XURLGE7GW3U1
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
-# PUBLIC_IPV6= ::1 (default: ::1)
+# PUBLIC_IPV6=  (default: ::1)
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -35,7 +35,7 @@ HOSTNAMES=mail.mailu.io
 POSTMASTER=admin
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-TLS_FLAVOR=letsencrypt
+TLS_FLAVOR=cert
 
 # Authentication rate limit (per source IP address)
 AUTH_RATELIMIT=10/minute;1000/hour 
diff --git a/tests/compose/rainloop/docker-compose.yml b/tests/compose/rainloop/docker-compose.yml
index 730e33d8..c91a92ed 100644
--- a/tests/compose/rainloop/docker-compose.yml
+++ b/tests/compose/rainloop/docker-compose.yml
@@ -22,23 +22,14 @@ services:
       driver: json-file
     ports:
       - "127.0.0.1:80:80"
-      - "::1:80:80"
       - "127.0.0.1:443:443"
-      - "::1:443:443"
       - "127.0.0.1:25:25"
-      - "::1:25:25"
       - "127.0.0.1:465:465"
-      - "::1:465:465"
       - "127.0.0.1:587:587"
-      - "::1:587:587"
       - "127.0.0.1:110:110"
-      - "::1:110:110"
       - "127.0.0.1:995:995"
-      - "::1:995:995"
       - "127.0.0.1:143:143"
-      - "::1:143:143"
       - "127.0.0.1:993:993"
-      - "::1:993:993"
     volumes:
       - "/mailu/certs:/certs"
 
diff --git a/tests/compose/rainloop/mailu.env b/tests/compose/rainloop/mailu.env
index 7ac75438..747dac58 100644
--- a/tests/compose/rainloop/mailu.env
+++ b/tests/compose/rainloop/mailu.env
@@ -18,12 +18,12 @@
 #VERSION=master
 
 # Set to a randomly generated 16 bytes string
-SECRET_KEY=QWE7CJZOET9BN4BU
+SECRET_KEY=V5J4SHRYVW9PZIQU
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
-# PUBLIC_IPV6= ::1 (default: ::1)
+# PUBLIC_IPV6=  (default: ::1)
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -35,7 +35,7 @@ HOSTNAMES=mail.mailu.io
 POSTMASTER=admin
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-TLS_FLAVOR=letsencrypt
+TLS_FLAVOR=cert
 
 # Authentication rate limit (per source IP address)
 AUTH_RATELIMIT=10/minute;1000/hour 
diff --git a/tests/compose/roundcube/docker-compose.yml b/tests/compose/roundcube/docker-compose.yml
index 989f6a67..567c1c69 100644
--- a/tests/compose/roundcube/docker-compose.yml
+++ b/tests/compose/roundcube/docker-compose.yml
@@ -22,23 +22,14 @@ services:
       driver: json-file
     ports:
       - "127.0.0.1:80:80"
-      - "::1:80:80"
       - "127.0.0.1:443:443"
-      - "::1:443:443"
       - "127.0.0.1:25:25"
-      - "::1:25:25"
       - "127.0.0.1:465:465"
-      - "::1:465:465"
       - "127.0.0.1:587:587"
-      - "::1:587:587"
       - "127.0.0.1:110:110"
-      - "::1:110:110"
       - "127.0.0.1:995:995"
-      - "::1:995:995"
       - "127.0.0.1:143:143"
-      - "::1:143:143"
       - "127.0.0.1:993:993"
-      - "::1:993:993"
     volumes:
       - "/mailu/certs:/certs"
 
diff --git a/tests/compose/roundcube/mailu.env b/tests/compose/roundcube/mailu.env
index 3c092f15..e87d1f61 100644
--- a/tests/compose/roundcube/mailu.env
+++ b/tests/compose/roundcube/mailu.env
@@ -18,12 +18,12 @@
 #VERSION=master
 
 # Set to a randomly generated 16 bytes string
-SECRET_KEY=KXGYDHIHWTS7VRUP
+SECRET_KEY=PGGO2JRQ59QV3DW7
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
-# PUBLIC_IPV6= ::1 (default: ::1)
+# PUBLIC_IPV6=  (default: ::1)
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -35,7 +35,7 @@ HOSTNAMES=mail.mailu.io
 POSTMASTER=admin
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-TLS_FLAVOR=letsencrypt
+TLS_FLAVOR=cert
 
 # Authentication rate limit (per source IP address)
 AUTH_RATELIMIT=10/minute;1000/hour 
diff --git a/tests/compose/webdav/docker-compose.yml b/tests/compose/webdav/docker-compose.yml
index 7e28c4cc..8e0db6e3 100644
--- a/tests/compose/webdav/docker-compose.yml
+++ b/tests/compose/webdav/docker-compose.yml
@@ -22,23 +22,14 @@ services:
       driver: json-file
     ports:
       - "127.0.0.1:80:80"
-      - "::1:80:80"
       - "127.0.0.1:443:443"
-      - "::1:443:443"
       - "127.0.0.1:25:25"
-      - "::1:25:25"
       - "127.0.0.1:465:465"
-      - "::1:465:465"
       - "127.0.0.1:587:587"
-      - "::1:587:587"
       - "127.0.0.1:110:110"
-      - "::1:110:110"
       - "127.0.0.1:995:995"
-      - "::1:995:995"
       - "127.0.0.1:143:143"
-      - "::1:143:143"
       - "127.0.0.1:993:993"
-      - "::1:993:993"
     volumes:
       - "/mailu/certs:/certs"
 
diff --git a/tests/compose/webdav/mailu.env b/tests/compose/webdav/mailu.env
index acb48abb..ac7b434c 100644
--- a/tests/compose/webdav/mailu.env
+++ b/tests/compose/webdav/mailu.env
@@ -18,12 +18,12 @@
 #VERSION=master
 
 # Set to a randomly generated 16 bytes string
-SECRET_KEY=QDHY5C0EME3YBI2W
+SECRET_KEY=XVDDSWOAGVF5J9QJ
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
-# PUBLIC_IPV6= ::1 (default: ::1)
+# PUBLIC_IPV6=  (default: ::1)
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -35,7 +35,7 @@ HOSTNAMES=mail.mailu.io
 POSTMASTER=admin
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-TLS_FLAVOR=letsencrypt
+TLS_FLAVOR=cert
 
 # Authentication rate limit (per source IP address)
 AUTH_RATELIMIT=10/minute;1000/hour