diff --git a/src/constants.js b/src/constants.js
index 26905cff0..173d8663c 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -42,6 +42,7 @@ exports = module.exports = {
     MYSQL_SERVICE_IPv4: '172.18.30.1',
     POSTGRESQL_SERVICE_IPv4: '172.18.30.2',
     MONGODB_SERVICE_IPv4: '172.18.30.3',
+    MAIL_SERVICE_IPv4: '172.18.30.4',
 
     NGINX_DEFAULT_CONFIG_FILE_NAME: 'default.conf',
 
diff --git a/src/infra_version.js b/src/infra_version.js
index 683fab856..fdc75f9b6 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -13,7 +13,7 @@ exports = module.exports = {
     'images': {
         // 'base': 'registry.docker.com/cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4',
         'graphite': 'registry.docker.com/cloudron/graphite:3.4.3@sha256:75df420ece34b31a7ce8d45b932246b7f524c123e1854f5e8f115a9e94e33f20',
-        'mail': 'registry.docker.com/cloudron/mail:3.14.4@sha256:415da0581c66e2ac94e9cd1e830c99328ad499018d77bd4ec7e6eb9d8f5a7336',
+        'mail': 'registry.docker.com/cloudron/mail:3.14.5@sha256:415da0581c66e2ac94e9cd1e830c99328ad499018d77bd4ec7e6eb9d8f5a7336',
         'mongodb': 'registry.docker.com/cloudron/mongodb:6.0.0@sha256:1108319805acfb66115aa96a8fdbf2cded28d46da0e04d171a87ec734b453d1e',
         'mysql': 'registry.docker.com/cloudron/mysql:3.4.3@sha256:8934c5ddcd69f24740d9a38f0de2937e47240238f3b8f5c482862eeccc5a21d2',
         'postgresql': 'registry.docker.com/cloudron/postgresql:5.3.1@sha256:eaea598aec086c90c0bb7bb8227bcde51b368bcca83d0082a4919bbb6f2d039f',
diff --git a/src/mailserver.js b/src/mailserver.js
index 2f5cdcca2..13b35e6cf 100644
--- a/src/mailserver.js
+++ b/src/mailserver.js
@@ -186,6 +186,7 @@ async function configureMail(mailFqdn, mailDomain, serviceConfig) {
                 --memory-swap -1 \
                 --dns 172.18.0.1 \
                 --dns-search=. \
+                --ip ${constants.MAIL_SERVICE_IPv4} \
                 -e CLOUDRON_MAIL_TOKEN=${cloudronToken} \
                 -e CLOUDRON_RELAY_TOKEN=${relayToken} \
                 -e LOGLEVEL=${logLevel} \