diff --git a/setup/INFRA_VERSION b/setup/INFRA_VERSION
index f9c78f301..c0bf1b81d 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=13
+INFRA_VERSION=14
 
 # WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 # These constants are used in the installer script as well
diff --git a/setup/start/setup_infra.sh b/setup/start/setup_infra.sh
index b38079352..bea9723ad 100755
--- a/setup/start/setup_infra.sh
+++ b/setup/start/setup_infra.sh
@@ -38,11 +38,10 @@ graphite_container_id=$(docker run --restart=always -d --name="graphite" \
     "${GRAPHITE_IMAGE}")
 echo "Graphite container id: ${graphite_container_id}"
 
-# mail (the port 25 is used by the box code mailer.js. apps use linking and MAIL_SMTP_PORT (2500) in addons.js)
+# mail (MAIL_SMTP_PORT is 2500 in addons.js. used in mailer.js as well)
 mail_container_id=$(docker run --restart=always -d --name="mail" \
     -m 75m \
     --memory-swap 150m \
-    -p 127.0.0.1:25:2500 \
     -h "${arg_fqdn}" \
     -e "DOMAIN_NAME=${arg_fqdn}" \
     -v "${DATA_DIR}/box/mail:/app/data" \
diff --git a/src/mailer.js b/src/mailer.js
index 0f2df4daa..f904c56e1 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -87,7 +87,7 @@ function processQueue() {
 
         var transport = nodemailer.createTransport(smtpTransport({
             host: mailServerIp,
-            port: 25 // this value comes from setup_infra.sh mail port binding
+            port: 2500 // this value comes from mail container
         }));
 
         var mailQueueCopy = gMailQueue;