diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix
index 5c6d44bc..26f79795 100644
--- a/modules/forgejo/default.nix
+++ b/modules/forgejo/default.nix
@@ -94,7 +94,7 @@
       mailer = {
         ENABLED = true;
         PROTOCOL = "smtps";
-        SMTP_ADDR = "mail.greenbaum.zone";
+        SMTP_ADDR = "mail.pub.solar";
         SMTP_PORT = 465;
         FROM = ''"pub.solar git server" <forgejo@pub.solar>'';
         USER = "admins@pub.solar";
diff --git a/modules/grafana/default.nix b/modules/grafana/default.nix
index 1080a1da..b62789e6 100644
--- a/modules/grafana/default.nix
+++ b/modules/grafana/default.nix
@@ -59,7 +59,7 @@
       };
       smtp = {
         enabled = true;
-        host = "mail.greenbaum.zone:465";
+        host = "mail.pub.solar:465";
         user = "admins@pub.solar";
         password = "\$__file{${config.age.secrets.grafana-smtp-password.path}}";
         from_address = "no-reply@pub.solar";
diff --git a/modules/mastodon/default.nix b/modules/mastodon/default.nix
index 3a12353d..85210e07 100644
--- a/modules/mastodon/default.nix
+++ b/modules/mastodon/default.nix
@@ -60,7 +60,7 @@
     vapidPublicKeyFile = "/run/agenix/mastodon-vapid-public-key";
     smtp = {
       createLocally = false;
-      host = "mail.greenbaum.zone";
+      host = "mail.pub.solar";
       port = 587;
       authenticate = true;
       user = "admins@pub.solar";
diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
index 00101c49..22003c8b 100644
--- a/modules/nextcloud/default.nix
+++ b/modules/nextcloud/default.nix
@@ -63,7 +63,7 @@
       mail_smtpname = "admins@pub.solar";
       mail_smtpsecure = "tls";
       mail_smtpauth = 1;
-      mail_smtphost = "mail.greenbaum.zone";
+      mail_smtphost = "mail.pub.solar";
       mail_smtpport = "587";
 
       # This is to allow connections to collabora and keycloak, among other services
diff --git a/modules/prometheus/default.nix b/modules/prometheus/default.nix
index f77081a8..b8ce54f9 100644
--- a/modules/prometheus/default.nix
+++ b/modules/prometheus/default.nix
@@ -129,7 +129,7 @@
                 send_resolved = true;
                 to = "admins@pub.solar";
                 from = "alerts@pub.solar";
-                smarthost = "mail.greenbaum.zone:465";
+                smarthost = "mail.pub.solar:465";
                 auth_username = "admins@pub.solar";
                 auth_password = "$SMTP_AUTH_PASSWORD";
                 require_tls = false;
diff --git a/secrets/matrix-synapse-secret-config.yaml.age b/secrets/matrix-synapse-secret-config.yaml.age
index dc28ea83..84f1952c 100644
Binary files a/secrets/matrix-synapse-secret-config.yaml.age and b/secrets/matrix-synapse-secret-config.yaml.age differ