diff --git a/README.md b/README.md
index 20995a5..82fb30d 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ Passbolt docker image provides several environment variables to configure differ
 * email_timeout:  timeout                        ( defaults to 30s)
 * email_username: username for email server auth ( defaults to email_user)
 * email_password: password for email server auth ( defaults to email_password)
+* email_tls:      set tls, boolean               ( defaults to false)
 
 ## Advanced configuration
 
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 6dae32b..3cbe644 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -107,6 +107,7 @@ email_setup() {
   # email_timeout
   # email_username
   # email_password
+  # email_tls
 
   local default_transport='Smtp'
   local default_from='contact@passbolt.com'
@@ -123,7 +124,9 @@ email_setup() {
   sed -i s:$default_port:${email_port:-587}:g $email_config
   sed -i s:$default_timeout:${email_timeout:-30}:g $email_config
   sed -i "0,/"$default_username"/s:"$default_username":'${email_username:-email_user}':" $email_config
-  sed -i "0,/"$default_username"/s:"$default_password":'${email_password:-email_password}':" $email_config
+  sed -i "0,/"$default_password"/s:"$default_password":'${email_password:-email_password}':" $email_config
+  sed -i "0,/tls/s:false:'${email_tls:-false}':" $email_config
+
 }
 
 gen_ssl_cert() {