diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index dc788bea..3c6e9de3 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -14,6 +14,9 @@
 # This variable is now set directly in `docker-compose.yml by the setup utility
 # ROOT={{ root }}
 
+# Mailu version to run (1.0, 1.1, etc. or master)
+#VERSION={{ version }}
+
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{ secret(16) }}
 
@@ -25,15 +28,15 @@ SECRET_KEY={{ secret(16) }}
 # Main mail domain
 DOMAIN={{ domain }}
 
-# Mail address of the postmaster
-POSTMASTER={{ postmaster }}
-
-#Chose how secure connections will behave:
-#TLS_FLAVOR={{ tls_flavor }}
-
 # Hostnames for this server, separated with comas
 HOSTNAMES={{ hostnames }}
 
+# Postmaster local part (will append the main mail domain)
+POSTMASTER={{ postmaster }}
+
+# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
+#TLS_FLAVOR={{ tls_flavor }}
+
 # Authentication rate limit (per source IP address)
 {% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %}
 AUTH_RATELIMIT={{ auth_ratelimit_pm }}/minute;{{ auth_ratelimit_ph }}/hour 
@@ -46,23 +49,23 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 # Optional features
 ###################################
 
-#Expose the admin interface
+# Expose the admin interface (value: true, false)
 #ADMIN={{ admin_enabled or 'false' }}
 
-#Chose which webmail to run if any
+# Choose which webmail to run if any (values: roundcube, rainloop, none)
 WEBMAIL={{ webmail_type }}
 
-#Antivirus solution
+# Dav server implementation (value: radicale, none)
+WEBDAV={{ webdav_enabled or 'none' }}
+
+# Antivirus solution (value: clamav, none)
 #ANTIVIRUS={{ antivirus_enabled or 'none' }}
 
 #Antispam solution
 ANTISPAM={{ antispam_enabled or 'none'}}
 
-#Dav server implementation
-WEBDAV={{ webdav_enabled or 'none' }}
-
 ###################################
-# Server behavior
+# Mail settings
 ###################################
 
 # Message size limit in bytes
@@ -89,9 +92,9 @@ DMARC_RUF={{ dmarc_ruf or 'admin' }}
 {% if welcome_enabled %}
 # Welcome email, enable and set a topic and body if you wish to send welcome
 # emails to all users.
-WELCOME={{ welcome_enable }}
-WELCOME_SUBJECT={{ welcome_subject }}
-WELCOME_BODY={{ welcome_body }}
+WELCOME={{ welcome_enable or 'false' }}
+WELCOME_SUBJECT={{ welcome_subject or 'Welcome to your new email account' }}
+WELCOME_BODY={{ welcome_body 'Welcome to your new email account, if you can read this, then it is configured properly!' }}
 {% endif %}
 
 # Maildir Compression
@@ -100,11 +103,6 @@ COMPRESSION={{ compression }}
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL={{ compression_level }}
 
-{% if domain_registration %}
-# Domain registration (remove to disable)
-DOMAIN_REGISTRATION=true
-{% endif %}
-
 ###################################
 # Web settings
 ###################################
@@ -127,12 +125,27 @@ WEBSITE={{ website }}
 # RECAPTCHA_PRIVATE_KEY={{ recaptcha_private_key }}
 {% endif %}
 
+{% if domain_registration %}
+# Domain registration (remove to disable)
+DOMAIN_REGISTRATION=true
+{% endif %}
+
 ###################################
 # Advanced settings
 ###################################
 
-# Specific password storage scheme
-PASSWORD_SCHEME={{ password_scheme or 'SHA512-CRYPT'}}
+# Log driver for front service. Possible values:
+# json-file (default)
+# journald (On systemd platforms, useful for Fail2Ban integration)
+# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!)
+LOG_DRIVER={{ log_driver or 'json-file' }}
+
+# Docker-compose project name, this will prepended to containers names.
+COMPOSE_PROJECT_NAME={{ compose_project_name or 'mailu' }}
+
+# Default password scheme used for newly created accounts and changed passwords
+# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
+PASSWORD_SCHEME={{ password_scheme or 'BLF-CRYPT' }}
 
 # Header to take the real ip from
 REAL_IP_HEADER={{ real_ip_header }}