diff --git a/.env.sample b/.env.sample
index 591be91..072cc51 100644
--- a/.env.sample
+++ b/.env.sample
@@ -7,6 +7,25 @@ DOMAIN=lasuite-docs.example.com
 
 LETS_ENCRYPT_ENV=production
 
+##############################################################################
+# BASIC SETTINGS 
+##############################################################################
+# FIXME: Move to Docker secret
+DJANGO_SECRET_KEY=ThisIsAnExampleKeyForDevPurposeOnly
+# FIXME: Move to docker secret
+DJANGO_SUPERUSER_PASSWORD=admin
+
+##############################################################################
+# EMAIL
+##############################################################################
+DJANGO_EMAIL_BRAND_NAME="La Suite Numérique"
+DJANGO_EMAIL_HOST="mail.example.com"
+DJANGO_EMAIL_LOGO_IMG="http://$DOMAIN/assets/logo-suite-numerique.png"
+DJANGO_EMAIL_PORT=1025
+
+##############################################################################
+# SINGLE SIGN ON
+##############################################################################
 # NOTE: OpenID Connect (OIDC) single sign-on is **required**, see recipe README
 OIDC_OP_JWKS_ENDPOINT=https://auth.${DOMAIN}/realms/impress/protocol/openid-connect/certs
 OIDC_OP_AUTHORIZATION_ENDPOINT=https://auth.${DOMAIN}/realms/impress/protocol/openid-connect/auth
@@ -22,3 +41,10 @@ LOGIN_REDIRECT_URL_FAILURE=https://${DOMAIN}
 LOGOUT_REDIRECT_URL=https://${DOMAIN}
 OIDC_REDIRECT_ALLOWED_HOSTS='["https://auth.${DOMAIN}", "https://${DOMAIN}"]'
 OIDC_AUTH_REQUEST_EXTRA_PARAMS="{'acr_values'='eidas1'}"
+
+##############################################################################
+# LOGGING
+##############################################################################
+LOGGING_LEVEL_HANDLERS_CONSOLE=INFO
+LOGGING_LEVEL_LOGGERS_ROOT=INFO
+LOGGING_LEVEL_LOGGERS_APP=INFO
diff --git a/compose.yml b/compose.yml
index 7994006..1f08010 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,24 +3,25 @@
 # NOTE: based on https://github.com/suitenumerique/docs/pull/855/ and https://github.com/suitenumerique/docs/pull/583/
 
 x-common-env: &common-env
-  DJANGO_CONFIGURATION: Demo
+  DJANGO_CONFIGURATION: Production
   DJANGO_ALLOWED_HOSTS: "*"
-  DJANGO_SECRET_KEY: ThisIsAnExampleKeyForDevPurposeOnly
+  DJANGO_SECRET_KEY:
   DJANGO_SETTINGS_MODULE: impress.settings
-  # FIXME: Move to docker secret
-  DJANGO_SUPERUSER_PASSWORD: admin
+  DJANGO_SUPERUSER_PASSWORD:
   # Logging
   # Set to DEBUG level for dev only
-  LOGGING_LEVEL_HANDLERS_CONSOLE: INFO
-  LOGGING_LEVEL_LOGGERS_ROOT: INFO
-  LOGGING_LEVEL_LOGGERS_APP: INFO
+  LOGGING_LEVEL_HANDLERS_CONSOLE:
+  LOGGING_LEVEL_LOGGERS_ROOT:
+  LOGGING_LEVEL_LOGGERS_APP:
   # Python
   PYTHONPATH: /app
   # Mail
-  DJANGO_EMAIL_BRAND_NAME: "La Suite Numérique"
-  DJANGO_EMAIL_HOST: "mailcatcher"
-  DJANGO_EMAIL_LOGO_IMG: "http://$DOMAIN/assets/logo-suite-numerique.png"
-  DJANGO_EMAIL_PORT: 1025
+  DJANGO_EMAIL_BRAND_NAME:
+  DJANGO_EMAIL_HOST:
+  DJANGO_EMAIL_LOGO_IMG:
+  DJANGO_EMAIL_PORT:
+  DJANGO_EMAIL_HOST_USER:
+  DJANGO_EMAIL_HOST_PASSWORD:
   # Backend url
   IMPRESS_BASE_URL: "https://${DOMAIN}"
   # Media