diff --git a/.editorconfig b/.editorconfig
index bfe2c913..0eb90718 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ insert_final_newline = true
 indent_style = space
 trim_trailing_whitespace = false
 
-[*.{yaml,yml,yml.dist,yml.tmpl}]
+[*.{yaml,yml}]
 indent_style = space
 indent_size = 2
 
diff --git a/.env.dist b/.env
similarity index 100%
rename from .env.dist
rename to .env
diff --git a/.gitignore b/.gitignore
index e4031321..67d620e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,7 @@
 #################################################
 
 .DS_Store
-.env
-
 config/opendkim/
-docker-compose.yml
 
 #################################################
 ###  IDEs  ######################################
diff --git a/README.md b/README.md
index 2749b505..039765ab 100644
--- a/README.md
+++ b/README.md
@@ -90,10 +90,12 @@ Minimum:
 Download the `docker-compose.yml`, `.env`, `env-mailserver` and the `setup.sh` files:
 
 ``` BASH
-curl -o setup.sh https://raw.githubusercontent.com/tomav/docker-mailserver/master/setup.sh && chmod a+x ./setup.sh
-curl -o docker-compose.yml https://raw.githubusercontent.com/tomav/docker-mailserver/master/docker-compose.yml.dist
-curl -o .env https://raw.githubusercontent.com/tomav/docker-mailserver/master/.env.dist
-curl -o env-mailserver https://raw.githubusercontent.com/tomav/docker-mailserver/master/env-mailserver.dist
+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
+wget https://raw.githubusercontent.com/tomav/docker-mailserver/master/env-mailserver
+
+chmod a+x ./setup.sh
 ```
 
 ### Create a docker-compose environment
diff --git a/docker-compose.yml.dist b/docker-compose.yml
similarity index 97%
rename from docker-compose.yml.dist
rename to docker-compose.yml
index 0dbaec1e..92ae9dcc 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   mail:
diff --git a/env-mailserver.dist b/env-mailserver
similarity index 100%
rename from env-mailserver.dist
rename to env-mailserver