diff --git a/setup/INFRA_VERSION b/setup/INFRA_VERSION
index cc41e971f..b4adfd125 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=19
+INFRA_VERSION=20
 
 # 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.7.0
 POSTGRESQL_IMAGE=cloudron/postgresql:0.7.0
 MONGODB_IMAGE=cloudron/mongodb:0.7.0
 REDIS_IMAGE=cloudron/redis:0.7.0 # if you change this, fix src/addons.js as well
-MAIL_IMAGE=cloudron/mail:0.7.0
+MAIL_IMAGE=cloudron/mail:0.8.0
 GRAPHITE_IMAGE=cloudron/graphite:0.7.0
 
 MYSQL_REPO=cloudron/mysql
diff --git a/src/cloudron.js b/src/cloudron.js
index 20a7b9b6f..abf8619d8 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -301,7 +301,7 @@ function addDnsRecords(callback) {
 
     if (config.isCustomDomain()) return callback();
 
-    var DKIM_SELECTOR = 'mail';
+    var DKIM_SELECTOR = 'cloudron';
     var DMARC_REPORT_EMAIL = 'dmarc-report@cloudron.io';
 
     var dkimPublicKeyFile = path.join(paths.MAIL_DATA_DIR, 'dkim/' + config.fqdn() + '/public');