diff --git a/.env b/.env
new file mode 100644
index 0000000..a14fa08
--- /dev/null
+++ b/.env
@@ -0,0 +1,70 @@
+##
+##  Manually dump .env files in .env.local.php with
+## `$ composer symfony:dump-env prod`
+##
+
+## Project environment
+# this should be set in docker-compose.yml file
+# APP_ENV=prod
+
+## Enable debug
+APP_DEBUG=false
+
+## Locale
+LOCALE=fr
+
+## Framework secret
+APP_SECRET=ThisTokenIsNotSoSecretChangeIt
+
+## Wopi server for editing documents online
+WOPI_SERVER=http://collabora:9980
+
+# must be manually set in .env.local
+# ADMIN_PASSWORD=
+
+## Symfony/framework-bundle
+TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$',${TRUSTED_HOST_2},${TRUSTED_HOST_3}
+TRUSTED_PROXIES=~
+
+## Doctrine/doctrine-bundle
+DATABASE_URL=
+
+## Symfony/swiftmailer
+## Mailer
+###> symfony/mailer ###
+# MAILER_DSN=smtp://localhost
+MAILER_DSN=
+###< symfony/mailer ###
+
+## Notifications
+NOTIFICATION_HOST=localhost:8001
+NOTIFICATION_FROM_EMAIL=admin@chill.social
+NOTIFICATION_FROM_NAME="Chill <admin@chill.social>"
+
+## Pgadmin credential
+PGADMIN_DEFAULT_EMAIL=
+PGADMIN_DEFAULT_PASSWORD=
+
+## OVH OpenStack Storage Container
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+## Redis Cache
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
+
+## Twilio
+TWILIO_SID=~
+TWILIO_SECRET=~
+DEFAULT_CARRIER_CODE=BE
+
+## DOCKER IMAGES REGISTRY
+#IMAGE_PHP=
+#IMAGE_NGINX=
+
+## DOCKER IMAGES TAG
+#VERSION=test
+#VERSION=prod
+
diff --git a/.env.dev b/.env.dev
new file mode 100644
index 0000000..4394c42
--- /dev/null
+++ b/.env.dev
@@ -0,0 +1,13 @@
+
+###> symfony/mailer ###
+# MAILER_DSN=smtp://localhost
+MAILER_DSN=smtp://smtp:1025
+###< symfony/mailer ###
+
+DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
+MAILER_URL=smtp://smtp:1025
+
+## Pgadmin credential
+PGADMIN_DEFAULT_EMAIL=admin@chill.social
+PGADMIN_DEFAULT_PASSWORD=password
+
diff --git a/.env.prod b/.env.prod
new file mode 100644
index 0000000..da63ef3
--- /dev/null
+++ b/.env.prod
@@ -0,0 +1,4 @@
+
+## Gelf
+GELF_HOST=gelf
+GELF_PORT=12201
diff --git a/.env.test b/.env.test
new file mode 100644
index 0000000..43e431b
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,4 @@
+# define your env variables for the test env here
+KERNEL_CLASS='App\Kernel'
+APP_SECRET='$ecretf0rt3st'
+ADMIN_PASSWORD=password
diff --git a/.gitignore b/.gitignore
index b3736a4..a4b0b03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,7 @@ bin/*
 config/secrets/
 
 ## env files
-.env*
-!.env.dist
+.env.local
 
 .composer/*
 composer.phar
@@ -75,4 +74,4 @@ yarn-error.log
 ###< symfony/webpack-encore-bundle ###
 
 docker-compose.override.yml
-docker-compose.override.yaml
\ No newline at end of file
+docker-compose.override.yaml