diff --git a/src/certificates.js b/src/certificates.js
index baba0ebfd..f5201e2b2 100644
--- a/src/certificates.js
+++ b/src/certificates.js
@@ -81,7 +81,7 @@ function getApi(app, callback) {
         // we simply update the account with the latest email we have each time when getting letsencrypt certs
         // https://github.com/ietf-wg-acme/acme/issues/30
         user.getOwner(function (error, owner) {
-            options.email = error ? 'admin@cloudron.io' : owner.email; // can error if not activated yet
+            options.email = error ? 'support@cloudron.io' : owner.email; // can error if not activated yet
 
             callback(null, api, options);
         });
diff --git a/src/mailer.js b/src/mailer.js
index e37f9ff4c..759cc978e 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -379,7 +379,7 @@ function outOfDiskSpace(message) {
 
         var mailOptions = {
             from: platform.mailConfig().from,
-            to: config.provider() === 'caas' ? 'admin@cloudron.io' : adminEmails.join(', '),
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
             subject: util.format('[%s] Out of disk space alert', config.fqdn()),
             text: render('out_of_disk_space.ejs', { fqdn: config.fqdn(), message: message, format: 'text' })
         };
@@ -397,7 +397,7 @@ function certificateRenewalError(domain, message) {
 
         var mailOptions = {
             from: platform.mailConfig().from,
-            to: config.provider() === 'caas' ? 'admin@cloudron.io' : adminEmails.join(', '),
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
             subject: util.format('[%s] Certificate renewal error', domain),
             text: render('certificate_renewal_error.ejs', { domain: domain, message: message, format: 'text' })
         };
@@ -414,7 +414,7 @@ function unexpectedExit(program, context) {
 
     var mailOptions = {
         from: platform.mailConfig().from,
-        to: 'admin@cloudron.io',
+        to: 'support@cloudron.io',
         subject: util.format('[%s] %s exited unexpectedly', config.fqdn(), program),
         text: render('unexpected_exit.ejs', { fqdn: config.fqdn(), program: program, context: context, format: 'text' })
     };