diff --git a/test/docker_mail/templates/docker-compose.yml b/test/docker_mail/templates/docker-compose.yml
index b0c6444b057e70fbaa59d1077b2496690de54eb3..1c72eeda30480a39db388e995762cc0c9b46987d 100644
--- a/test/docker_mail/templates/docker-compose.yml
+++ b/test/docker_mail/templates/docker-compose.yml
@@ -182,36 +182,20 @@ services:
     container_name: mailman-core
     image: maxking/mailman-core:0.4
     restart: always
+    env_file: mailu.env
     depends_on:
       - mailman-db
     volumes:
       - "{{ basedir }}/mailman-core:/opt/mailman:rw,z"
-    environment:
-      - DATABASE_URL=mysql://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb?charset=utf8mb4
-      - MTA=postfix
-      - MM_HOSTNAME=mailman-core
-      - SMTP_HOST=postfix
-      - SMTP_PORT=25
-      - MAILMAN_REST_USER=mailman
-      - MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }}
-      - HYPERKITTY_URL=http://mailman-web:8000/hyperkitty
-      - HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
 
   mailman-web:
     image: maxking/mailman-web:0.4
     restart: always
+    env_file: mailu.env
     depends_on:
       - mailman-db
     volumes:
       - "{{ basedir }}/mailman-web:/opt/mailman-web-data:rw,z"
-    environment:
-      - DATABASE_URL=mysql://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb?charset=utf8mb4
-      - HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
-      - SECRET_KEY={{ mailman_secret_key }}
-      - SERVE_FROM_DOMAIN={{ listserver }}
-      - MAILMAN_REST_URL=http://mailman-core:8001
-      - MAILMAN_REST_USER=mailman
-      - MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }}
 
   mailman-db:
     image: mariadb:10.5
diff --git a/test/docker_mail/templates/mailman.env b/test/docker_mail/templates/mailman.env
new file mode 100644
index 0000000000000000000000000000000000000000..f00c0d8d46d2204a227fd6dc9d5c8c15a920590e
--- /dev/null
+++ b/test/docker_mail/templates/mailman.env
@@ -0,0 +1,29 @@
+
+# MTA to use 
+MTA=postfix
+
+# SMTP Host and Port 
+SMTP_HOST=smtp
+SMTP_PORT=25
+
+# External Domain for Mailman web Interface
+SERVE_FROM_DOMAIN={{ listserver }}
+
+# Mailman Secret Key 
+SECRET_KEY={{ mailman_secret_key }}
+
+# Database for mailman and Hyperkitty 
+DATABASE_URL=mysql://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb?charset=utf8mb4
+
+# Internal hostname of the Mailman Core Container 
+MM_HOSTNAME=mailman-core
+
+# User and Password for Mailman API
+MAILMAN_REST_USER=mailman
+MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }}
+
+# internal URL and API Key for Hyperkitty 
+HYPERKITTY_URL=http://mailman-web:8000/hyperkitty
+HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
+
+