diff --git a/README.md b/README.md
index 98849318..f2b5025e 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,9 @@ Download the docker-compose.yml, the .env and the setup.sh files:
 
 #### Create a docker-compose environment
 
-- Edit the files `.env` and `.env-mailserver` to your liking.
+- Edit the files `.env` and `.env-mailserver` to your liking:
+  - `.env` contains the configuration for docker-compose
+  - `env-mailserver` contains the configuration for the mailserver container
   - These files supports only simple `VAR=VAL` lines (see [Documentation](https://docs.docker.com/compose/env-file/)).
   - Don't quote your values.
   - Variable substitution is *not* supported (e.g. `OVERRIDE_HOSTNAME=$HOSTNAME.$DOMAINNAME`).
diff --git a/docker-compose.elk.yml.dist b/docker-compose.elk.yml.dist
index e9cf3370..0c308a3c 100644
--- a/docker-compose.elk.yml.dist
+++ b/docker-compose.elk.yml.dist
@@ -17,64 +17,9 @@ services:
     - maildata:/var/mail
     - maillogs:/var/log/mail
     - ./config/:/tmp/docker-mailserver/
-    environment:
-    - DMS_DEBUG=${DMS_DEBUG}
-    - ENABLE_CLAMAV=${ENABLE_CLAMAV}
-    - ONE_DIR=${ONE_DIR}
-    - ENABLE_POP3=${ENABLE_POP3}
-    - ENABLE_FAIL2BAN=${ENABLE_FAIL2BAN}
-    - ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE}
-    - OVERRIDE_HOSTNAME=${OVERRIDE_HOSTNAME}
-    - POSTMASTER_ADDRESS=${POSTMASTER_ADDRESS}
-    - POSTSCREEN_ACTION=${POSTSCREEN_ACTION}
-    - ENABLE_SRS=${ENABLE_SRS}
-    - REPORT_RECIPIENT=${REPORT_RECIPIENT}
-    - REPORT_SENDER=${REPORT_SENDER}
-    - REPORT_INTERVAL=${REPORT_INTERVAL}
-    - SMTP_ONLY=${SMTP_ONLY}
-    - SSL_TYPE=${SSL_TYPE}
-    - PERMIT_DOCKER=${PERMIT_DOCKER}
-    - VIRUSMAILS_DELETE_DELAY=${VIRUSMAILS_DELETE_DELAY}
-    - ENABLE_POSTFIX_VIRTUAL_TRANSPORT=${ENABLE_POSTFIX_VIRTUAL_TRANSPORT}
-    - POSTFIX_DAGENT=${POSTFIX_DAGENT}
-    - ENABLE_SPAMASSASSIN=${ENABLE_SPAMASSASSIN}
-    - SA_TAG=${SA_TAG}
-    - SA_TAG2=${SA_TAG2}
-    - SA_KILL=${SA_KILL}
-    - SA_SPAM_SUBJECT=${SA_SPAM_SUBJECT}
-    - ENABLE_FETCHMAIL=${ENABLE_FETCHMAIL}
-    - FETCHMAIL_POLL=${FETCHMAIL_POLL}
-    - ENABLE_LDAP=${ENABLE_LDAP}
-    - LDAP_START_TLS=${LDAP_START_TLS}
-    - LDAP_SERVER_HOST=${LDAP_SERVER_HOST}
-    - LDAP_SEARCH_BASE=${LDAP_SEARCH_BASE}
-    - LDAP_BIND_DN=${LDAP_BIND_DN}
-    - LDAP_BIND_PW=${LDAP_BIND_PW}
-    - LDAP_QUERY_FILTER_USER=${LDAP_QUERY_FILTER_USER}
-    - LDAP_QUERY_FILTER_GROUP=${LDAP_QUERY_FILTER_GROUP}
-    - LDAP_QUERY_FILTER_ALIAS=${LDAP_QUERY_FILTER_ALIAS}
-    - LDAP_QUERY_FILTER_DOMAIN=${LDAP_QUERY_FILTER_DOMAIN}
-    - LOGROTATE_INTERVAL=${LOGROTATE_INTERVAL}
-    - DOVECOT_TLS=${DOVECOT_TLS}
-    - DOVECOT_USER_FILTER=${DOVECOT_USER_FILTER}
-    - DOVECOT_PASS_FILTER=${DOVECOT_PASS_FILTER}
-    - ENABLE_POSTGREY=${ENABLE_POSTGREY}
-    - POSTGREY_DELAY=${POSTGREY_DELAY}
-    - POSTGREY_MAX_AGE=${POSTGREY_MAX_AGE}
-    - POSTGREY_AUTO_WHITELIST_CLIENTS=${POSTGREY_AUTO_WHITELIST_CLIENTS}
-    - POSTGREY_TEXT=${POSTGREY_TEXT}
-    - ENABLE_SASLAUTHD=${ENABLE_SASLAUTHD}
-    - SASLAUTHD_MECHANISMS=${SASLAUTHD_MECHANISMS}
-    - SASLAUTHD_MECH_OPTIONS=${SASLAUTHD_MECH_OPTIONS}
-    - SASLAUTHD_LDAP_SERVER=${SASLAUTHD_LDAP_SERVER}
-    - SASLAUTHD_LDAP_SSL=${SASLAUTHD_LDAP_SSL}
-    - SASLAUTHD_LDAP_BIND_DN=${SASLAUTHD_LDAP_BIND_DN}
-    - SASLAUTHD_LDAP_PASSWORD=${SASLAUTHD_LDAP_PASSWORD}
-    - SASLAUTHD_LDAP_SEARCH_BASE=${SASLAUTHD_LDAP_SEARCH_BASE}
-    - SASLAUTHD_LDAP_FILTER=${SASLAUTHD_LDAP_FILTER}
-    - SASLAUTHD_LDAP_START_TLS=${SASLAUTHD_LDAP_START_TLS}
-    - SASLAUTHD_LDAP_TLS_CHECK_PEER=${SASLAUTHD_LDAP_TLS_CHECK_PEER}
-    - SASL_PASSWD=${SASL_PASSWD}
+    env_file:
+    - .env
+    - env-mailserver
     cap_add:
     - NET_ADMIN
     - SYS_PTRACE
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
index 9d995e7e..58cb4f6f 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -17,7 +17,7 @@ services:
     - ./config/:/tmp/docker-mailserver/
     env_file:
     - .env
-    - .env-mailserver
+    - env-mailserver
     cap_add:
     - NET_ADMIN
     - SYS_PTRACE
diff --git a/.env-mailserver.dist b/env-mailserver.dist
similarity index 100%
rename from .env-mailserver.dist
rename to env-mailserver.dist