diff --git a/.dockerignore b/.dockerignore
index 65e3ba2e..210bfde7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
+.github
 test/
diff --git a/README.md b/README.md
index d87eea9d..68f8be01 100644
--- a/README.md
+++ b/README.md
@@ -88,13 +88,13 @@ Minimum:
 
 ### Get the tools
 
-Download the `docker-compose.yml`, `.env`, `env-mailserver` and the `setup.sh` files:
+Download the `docker-compose.yml`, `compose.env`, `mailserver.env` and the `setup.sh` files:
 
 ``` BASH
 wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/setup.sh
 wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/docker-compose.yml
-wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/env-mailserver
-curl -o .env https://raw.githubusercontent.com/tomav/docker-mailserver/master/template.env
+wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/mailserver.env
+curl -o .env https://raw.githubusercontent.com/tomav/docker-mailserver/master/compose.env
 
 chmod a+x ./setup.sh
 ```
@@ -102,14 +102,14 @@ chmod a+x ./setup.sh
 ### Create a docker-compose environment
 
 - [Install the latest docker-compose](https://docs.docker.com/compose/install/)
-- Edit the files `.env` and `env-mailserver` to your liking:
+- Edit the files `.env` and `mailserver.env` to your liking:
   - `.env` contains the configuration for docker-compose
-  - `env-mailserver` contains the configuration for the mailserver container
+  - `mailserver.env` 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`).
 
-**Note:**: Variables in `.env` are expanded in the `docker-compose.yml` file **only** and **not** in the container. The file `env-mailserver` serves this case where environment variables are used in the container.
+**Note:**: Variables in `.env` are expanded in the `docker-compose.yml` file **only** and **not** in the container. The file `mailserver.env` serves this case where environment variables are used in the container.
 
 **Note:** If you want to use a bare domain (host name equals domain name) see [FAQ](https://github.com/tomav/docker-mailserver/wiki/FAQ-and-Tips#can-i-use-nakedbare-domains-no-host-name).
 
diff --git a/compose.env b/compose.env
new file mode 100644
index 00000000..c146c234
--- /dev/null
+++ b/compose.env
@@ -0,0 +1,7 @@
+# –––––––––––––––––––––––––––––––––––––––––––––––
+# ––– Docker Compose Settings Variables –––––––––
+# –––––––––––––––––––––––––––––––––––––––––––––––
+
+HOSTNAME=mail
+DOMAINNAME=domain.com
+CONTAINER_NAME=mail
diff --git a/docker-compose.yml b/docker-compose.yml
index 92ae9dcc..82d32941 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,7 @@ services:
       - maillogs:/var/log/mail
       - ./config/:/tmp/docker-mailserver/
     env_file:
-      - .env
-      - env-mailserver
+      - mailserver.env
     cap_add:
       - NET_ADMIN
       - SYS_PTRACE
diff --git a/env-mailserver b/mailserver.env
similarity index 97%
rename from env-mailserver
rename to mailserver.env
index da300849..4d76f5e1 100644
--- a/env-mailserver
+++ b/mailserver.env
@@ -1,7 +1,6 @@
-
-# -----------------------------------------------------------------------------------------------------------------------------
-# --------------------- General Settings --------------------------------------------------------------------------------------
-# -----------------------------------------------------------------------------------------------------------------------------
+# –––––––––––––––––––––––––––––––––––––––––––––––
+# ––– Mailserver Environment Variables ––––––––––
+# –––––––––––––––––––––––––––––––––––––––––––––––
 
 # empty => uses the `hostname` command to get the mail server's canonical hostname
 # => Specify a fully-qualified domainname to serve mail for.  This is used for many of the config features so if you can't set your hostname (e.g. you're in a container platform that doesn't let you) specify it in this environment variable.
diff --git a/template.env b/template.env
deleted file mode 100644
index b934fb7a..00000000
--- a/template.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# -----------------------------------------------------------------------------------------------------------------------------
-# --------------------- General Settings --------------------------------------------------------------------------------------
-# -----------------------------------------------------------------------------------------------------------------------------
-
-HOSTNAME=mail
-DOMAINNAME=domain.com
-CONTAINER_NAME=mail