diff --git a/hosts/nachtigall/apps/forgejo.nix b/hosts/nachtigall/apps/forgejo.nix
index eb76588c..638b6051 100644
--- a/hosts/nachtigall/apps/forgejo.nix
+++ b/hosts/nachtigall/apps/forgejo.nix
@@ -55,7 +55,7 @@
       mailer = {
         ENABLED = true;
         PROTOCOL = "smtps";
-        SMTP_ADDR = "mx2.greenbaum.cloud";
+        SMTP_ADDR = "mail.greenbaum.zone";
         SMTP_PORT = 465;
         FROM = ''"pub.solar git server" <forgejo@pub.solar>'';
         USER = "admins@pub.solar";
diff --git a/hosts/nachtigall/apps/mastodon.nix b/hosts/nachtigall/apps/mastodon.nix
index a99cf5b5..babb4647 100644
--- a/hosts/nachtigall/apps/mastodon.nix
+++ b/hosts/nachtigall/apps/mastodon.nix
@@ -54,7 +54,7 @@
     vapidPublicKeyFile = "/run/agenix/mastodon-vapid-public-key";
     smtp = {
       createLocally = false;
-      host = "mx2.greenbaum.cloud";
+      host = "mail.greenbaum.zone";
       port = 587;
       authenticate = true;
       user = "admins@pub.solar";
diff --git a/hosts/nachtigall/apps/nextcloud.nix b/hosts/nachtigall/apps/nextcloud.nix
index 2c946bb3..d33775e0 100644
--- a/hosts/nachtigall/apps/nextcloud.nix
+++ b/hosts/nachtigall/apps/nextcloud.nix
@@ -63,7 +63,7 @@
       mail_smtpname = "admins@pub.solar";
       mail_smtpsecure = "tls";
       mail_smtpauth = 1;
-      mail_smtphost = "mx2.greenbaum.cloud";
+      mail_smtphost = "mail.greenbaum.zone";
       mail_smtpport = "587";
 
       # This is to allow connections to collabora and keycloak, among other services
diff --git a/terraform/dns.tf b/terraform/dns.tf
index 57b230c8..85ee9e08 100644
--- a/terraform/dns.tf
+++ b/terraform/dns.tf
@@ -122,7 +122,7 @@ resource "namecheap_domain_records" "pub-solar" {
   record {
     hostname = "@"
     type = "TXT"
-    address = "v=spf1 include:spf.greenbaum.cloud a:list.pub.solar ~all"
+    address = "v=spf1 include:spf.greenbaum.zone a:list.pub.solar ~all"
   }
   record {
     hostname = "list"
@@ -142,7 +142,7 @@ resource "namecheap_domain_records" "pub-solar" {
   record {
     hostname = "@"
     type = "MX"
-    address = "mx2.greenbaum.cloud."
+    address = "mail.greenbaum.zone."
     mx_pref = "0"
   }
   record {