diff --git a/.gitignore b/.gitignore
index e539b609..96ac6719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ docs/mercure.html
 docker-compose.override.yml
 .phpunit.result.cache
 docs/swagger/swagger-inlined.json
-shlink-dev.local.env
+shlink-dev.env
diff --git a/docker-compose.yml b/docker-compose.yml
index 718ba4c1..b9fbd210 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,7 +36,6 @@ services:
             DEFAULT_DOMAIN: localhost:8000
         env_file:
             - path: shlink-dev.env
-            - path: shlink-dev.local.env
               required: false
         extra_hosts:
             - 'host.docker.internal:host-gateway'
@@ -66,7 +65,6 @@ services:
             DEFAULT_DOMAIN: localhost:8800
         env_file:
             - path: shlink-dev.env
-            - path: shlink-dev.local.env
               required: false
         extra_hosts:
             - 'host.docker.internal:host-gateway'
diff --git a/shlink-dev.env b/shlink-dev.env.dist
similarity index 94%
rename from shlink-dev.env
rename to shlink-dev.env.dist
index 02c2aa92..5ab21ea1 100644
--- a/shlink-dev.env
+++ b/shlink-dev.env.dist
@@ -1,5 +1,6 @@
 LC_ALL=C
 #APP_ENV=dev
+#GEOLITE_LICENSE_KEY=
 
 # URL shortener
 IS_HTTPS_ENABLED=false
@@ -9,7 +10,7 @@ DB_DRIVER=mysql
 DB_USER=root
 DB_PASSWORD=root
 DB_NAME=shlink
-# DB_NAME=shlink_foo
+#DB_NAME=shlink_foo
 DB_HOST=shlink_db_mysql
 
 # Database - Maria
@@ -43,8 +44,8 @@ DB_HOST=shlink_db_mysql
 # 4. Go to http://localhost:8003/index.php?module=UsersManager&action=userSecurity, scroll down, click
 #    "Create new token" and once generated, paste the token into the `MATOMO_API_TOKEN` var below.
 # 5. Copy the config below and paste it in a new shlink-dev.local.env file.
-#MATOMO_ENABLED=false
-#MATOMO_BASE_URL=http://shlink_matomo
+MATOMO_ENABLED=false
+MATOMO_BASE_URL=http://shlink_matomo
 #MATOMO_SITE_ID=
 #MATOMO_API_TOKEN=