diff --git a/CHANGELOG.md b/CHANGELOG.md
index a11bb64..e8d78d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [Unreleased](https://github.com/passbolt/passbolt_api/compare/v1.6.1...HEAD)
 
-## [1.6.0] - 2017-06-23
+## [1.6.1](https://github.com/passbolt/passbolt_api/compare/v1.6.0...v1.6.1) - 2017-06-29
+### Fixed
+- PASSBOLT-2158: corrected management of fullbaseurl throug url env variable.
+- PASSBOLT-2164: corrected typo on email_transport env variable. [#24](https://github.com/passbolt/passbolt_docker/issues/24)
+- PASSBOLT-2166: http to https redirection fixed. [#19](https://github.com/passbolt/passbolt_docker/issues/19)
+- PASSBOLT-2167: healthcheck does not work on container. [#26](https://github.com/passbolt/passbolt_docker/issues/26)
+
+### Added
+
+- PASSBOLT-2165: Added TLS support through email_tls env variable. [#25](https://github.com/passbolt/passbolt_docker/issues/25)
+
+## [1.6.0](https://github.com/passbolt/passbolt_api/compare/v1.5.1...v1.6.0) - 2017-06-23
 ### Added
 - Added email set up support though environment variables
 - Added cronjob to send queued emails
diff --git a/Dockerfile b/Dockerfile
index cf405db..f52ceed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,7 @@ ARG BASE_PHP_DEPS="php5-curl \
       php5-xsl \
       php5-fpm \
       php5-phar \
+      php5-posix \
       php5-xml \
       php5-openssl \
       php5-zlib \
diff --git a/README.md b/README.md
index b733aa5..82fb30d 100644
--- a/README.md
+++ b/README.md
@@ -85,13 +85,14 @@ Passbolt docker image provides several environment variables to configure differ
 
 ### Email variables
 
-* email_tansport: transport protocol             ( defaults to Smtp)
+* email_transport: transport protocol             ( defaults to Smtp)
 * email_from:     from email address             ( defaults to contact@mydomain.local)
 * email_host:     server hostname                ( defaults to localhost)
 * email_port:     server port                    ( defaults to 587)
 * 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 98720d0..3cbe644 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -50,7 +50,11 @@ core_setup() {
   cp $core_config{.default,}
   sed -i s:$default_salt:${salt:-$default_salt}:g $core_config
   sed -i s:$default_seed:${cipherseed:-$default_seed}:g $core_config
+  sed -i "/$default_url/ s:\/\/::" $core_config
   sed -i s:$default_url:${url:-$default_url}:g $core_config
+  if [ "$ssl" != false ]; then
+    sed -i s:http:https:g $core_config
+  fi
 }
 
 db_setup() {
@@ -82,7 +86,6 @@ app_setup() {
   local default_public_key='unsecure.key'
   local default_private_key='unsecure_private.key'
   local default_fingerprint='2FC8945833C51946E937F9FED47B0811573EE67E'
-  local default_ssl='force'
   local default_registration='public'
   local gpg_home='/var/lib/nginx/.gnupg'
   local auto_fingerprint=$(su -m -c "$gpg --fingerprint |grep fingerprint| awk '{for(i=4;i<=NF;++i)printf \$i}'" -ls /bin/bash nginx)
@@ -97,13 +100,14 @@ app_setup() {
 
 email_setup() {
   #Env vars:
-  # email_tansport
+  # email_transport
   # email_from
   # email_host
   # email_port
   # email_timeout
   # email_username
   # email_password
+  # email_tls
 
   local default_transport='Smtp'
   local default_from='contact@passbolt.com'
@@ -114,13 +118,15 @@ email_setup() {
   local default_password="''"
 
   cp $email_config{.default,}
-  sed -i s:$default_transport:${email_tansport:-Smtp}:g $email_config
+  sed -i s:$default_transport:${email_transport:-Smtp}:g $email_config
   sed -i s:$default_from:${email_from:-contact@mydomain.local}:g $email_config
   sed -i s:$default_host:${email_host:-localhost}:g $email_config
   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() {
diff --git a/conf/passbolt.conf b/conf/passbolt.conf
index 57df81e..af68783 100644
--- a/conf/passbolt.conf
+++ b/conf/passbolt.conf
@@ -36,6 +36,7 @@ server {
     fastcgi_split_path_info ^(.+\.php)(.+)$;
     include                 fastcgi_params;
     fastcgi_param           SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param           SERVER_NAME $http_host;
   }
 
   location ~* \.(jpe?g|woff|woff2|ttf|gif|png|bmp|ico|css|js|json|pdf|zip|htm|html|docx?|xlsx?|pptx?|txt|wav|swf|svg|avi|mp\d)$ {
@@ -86,6 +87,7 @@ server {
     fastcgi_split_path_info ^(.+\.php)(.+)$;
     include                 fastcgi_params;
     fastcgi_param           SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param           SERVER_NAME $http_host;
   }
 
   location ~* \.(jpe?g|woff|woff2|ttf|gif|png|bmp|ico|css|js|json|pdf|zip|htm|html|docx?|xlsx?|pptx?|txt|wav|swf|svg|avi|mp\d)$ {