diff --git a/setup/INFRA_VERSION b/setup/INFRA_VERSION
index 1e7b314a2..709a274ab 100644
--- a/setup/INFRA_VERSION
+++ b/setup/INFRA_VERSION
@@ -3,7 +3,7 @@
 # If you change the infra version, be sure to put a warning
 # in the change log
 
-INFRA_VERSION=26
+INFRA_VERSION=27
 
 # WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 # These constants are used in the installer script as well
@@ -12,7 +12,7 @@ MYSQL_IMAGE=cloudron/mysql:0.11.0
 POSTGRESQL_IMAGE=cloudron/postgresql:0.9.0
 MONGODB_IMAGE=cloudron/mongodb:0.9.0
 REDIS_IMAGE=cloudron/redis:0.8.0 # if you change this, fix src/addons.js as well
-MAIL_IMAGE=cloudron/mail:0.9.0
+MAIL_IMAGE=cloudron/mail:0.10.0
 GRAPHITE_IMAGE=cloudron/graphite:0.8.0
 
 MYSQL_REPO=cloudron/mysql
diff --git a/setup/start/setup_infra.sh b/setup/start/setup_infra.sh
index 5a7468a8e..027d80bd7 100755
--- a/setup/start/setup_infra.sh
+++ b/setup/start/setup_infra.sh
@@ -43,11 +43,14 @@ if docker images "${GRAPHITE_REPO}" | tail -n +2 | awk '{ print $1 ":" $2 }' | g
 fi
 
 # mail (MAIL_SMTP_PORT is 2500 in addons.js. used in mailer.js as well)
+# MAIL_SERVER_NAME is the hostname of the mailserver i.e server uses these certs
+# MAIL_DOMAIN is the domain for which this server is relaying mails
 mail_container_id=$(docker run --restart=always -d --name="mail" \
     -m 75m \
     --memory-swap 150m \
     -h "${arg_fqdn}" \
-    -e "DOMAIN_NAME=${arg_fqdn}" \
+    -e "MAIL_SERVER_NAME=${arg_fqdn}" \
+    -e "MAIL_DOMAIN=${arg_fqdn}" \
     -v "${DATA_DIR}/box/mail:/app/data" \
     --read-only -v /tmp -v /run \
     "${MAIL_IMAGE}")