diff --git a/Makefile b/Makefile
index 116c0051..52ba78d4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,31 +30,31 @@ endif
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
 		-v "`pwd`/test":/tmp/docker-mailserver-test \
 		-v "`pwd`/test/onedir":/var/mail-state \
-		-e ENABLE_CLAMAV="$(ENABLE_CLAMAV)" \
-		-e ENABLE_SPAMASSASSIN="$(ENABLE_SPAMASSASSIN)" \
-		-e ENABLE_POP3="$(ENABLE_POP3)" \
-		-e ENABLE_FAIL2BAN="$(ENABLE_FAIL2BAN)" \
-		-e ENABLE_MANAGESIEVE="$(ENABLE_MANAGESIEVE)" \
-		-e ENABLE_FETCHMAIL="$(ENABLE_FETCHMAIL)" \
-		-e ONE_DIR="$(ONE_DIR)" \
-		-e PERMIT_DOCKER="$(PERMIT_DOCKER)" \
-		-e ENABLE_LDAP="$(ENABLE_LDAP)" \
-		-e LDAP_SERVER_HOST="$(LDAP_SERVER_HOST)" \
-		-e LDAP_SEARCH_BASE="$(LDAP_SEARCH_BASE)" \
-		-e LDAP_BIND_DN="$(LDAP_BIND_DN)" \
-		-e ENABLE_SASLAUTHD="$(ENABLE_SASLAUTHD)" \
-		-e SASLAUTHD_MECHANISMS="$(SASLAUTHD_MECHANISMS)" \
-		-e SASLAUTHD_LDAP_SERVER="$(SASLAUTHD_LDAP_SERVER)" \
-		-e SASLAUTHD_LDAP_BIND_DN="$(SASLAUTHD_LDAP_BIND_DN)" \
-		-e SASLAUTHD_LDAP_PASSWORD="$(SASLAUTHD_LDAP_PASSWORD)" \
-		-e SASLAUTHD_LDAP_SEARCH_BASE="$(SASLAUTHD_LDAP_SEARCH_BASE)" \
-		-e SMTP_ONLY="$(SMTP_ONLY)" \
-		-e SA_TAG="$(SA_TAG)" \
-		-e SA_TAG2="$(SA_TAG2)" \
-		-e SA_KILL="$(SA_KILL)" \
-		-e VIRUSMAILS_DELETE_DELAY="$(VIRUSMAILS_DELETE_DELAY)" \
-		-e SASL_PASSWD="$(SASL_PASSWD)" \
-		-e DMS_DEBUG="$(DMS_DEBUG)" \
+		-e ENABLE_CLAMAV=$(ENABLE_CLAMAV) \
+		-e ENABLE_SPAMASSASSIN=$(ENABLE_SPAMASSASSIN) \
+		-e ENABLE_POP3=$(ENABLE_POP3) \
+		-e ENABLE_FAIL2BAN=$(ENABLE_FAIL2BAN) \
+		-e ENABLE_MANAGESIEVE=$(ENABLE_MANAGESIEVE) \
+		-e ENABLE_FETCHMAIL=$(ENABLE_FETCHMAIL) \
+		-e ONE_DIR=$(ONE_DIR) \
+		-e PERMIT_DOCKER=$(PERMIT_DOCKER) \
+		-e ENABLE_LDAP=$(ENABLE_LDAP) \
+		-e LDAP_SERVER_HOST=$(LDAP_SERVER_HOST) \
+		-e LDAP_SEARCH_BASE=$(LDAP_SEARCH_BASE) \
+		-e LDAP_BIND_DN=$(LDAP_BIND_DN) \
+		-e ENABLE_SASLAUTHD=$(ENABLE_SASLAUTHD) \
+		-e SASLAUTHD_MECHANISMS=$(SASLAUTHD_MECHANISMS) \
+		-e SASLAUTHD_LDAP_SERVER=$(SASLAUTHD_LDAP_SERVER) \
+		-e SASLAUTHD_LDAP_BIND_DN=$(SASLAUTHD_LDAP_BIND_DN) \
+		-e SASLAUTHD_LDAP_PASSWORD=$(SASLAUTHD_LDAP_PASSWORD) \
+		-e SASLAUTHD_LDAP_SEARCH_BASE=$(SASLAUTHD_LDAP_SEARCH_BASE) \
+		-e SMTP_ONLY=$(SMTP_ONLY) \
+		-e SA_TAG=$(SA_TAG) \
+		-e SA_TAG2=$(SA_TAG2) \
+		-e SA_KILL=$(SA_KILL) \
+		-e VIRUSMAILS_DELETE_DELAY=$(VIRUSMAILS_DELETE_DELAY) \
+		-e SASL_PASSWD=$(SASL_PASSWD) \
+		-e DMS_DEBUG=$(DMS_DEBUG) \
 		--cap-add=NET_ADMIN \
 		-h mail.my-domain.com -t $(NAME)
 
@@ -74,6 +74,7 @@ run-local:
 	sleep 15
 
 fixtures:
+	# Display env configuration
 	docker exec mail printenv
 	cp config/postfix-accounts.cf config/postfix-accounts.cf.bak
 	# Setup sieve & create filtering folder (INBOX/spam)
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 8ab20833..b0d07add 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -334,6 +334,7 @@ function _setup_default_vars() {
 	notify 'task' "Setting up default variables [$FUNCNAME]"
 
 	for var in ${!DEFAULT_VARS[@]}; do
+		echo "export $var=${DEFAULT_VARS[$var]}" >> /root/.bashrc
 		export $var=${DEFAULT_VARS[$var]}
 		[ $? != 0 ] && notify 'err' "Unable to set $var=${DEFAULT_VARS[$var]}" && return 1
 		notify 'inf' "Set $var=${DEFAULT_VARS[$var]}"