diff --git a/hosts/prefect/services/caddy.nix b/hosts/prefect/services/caddy.nix
index c77788a7..ec573106 100644
--- a/hosts/prefect/services/caddy.nix
+++ b/hosts/prefect/services/caddy.nix
@@ -21,7 +21,7 @@ in
     };
     email = "pyrox@pyrox.dev";
     virtualHosts = {
-      "mail.pyrox.dev" = { };
+      "mail2.pyrox.dev" = { };
       # Redirect old domains -> pyrox.dev
       "blog.pyrox.dev" = {
         serverAliases = [
@@ -251,6 +251,7 @@ in
 
       "http://mail.pyrox.dev" = {
         serverAliases = [
+          "http://mail2.pyrox.dev"
           "http://mta-sts.pyrox.dev"
           "http://autodiscover.pyrox.dev"
           "http://autoconfig.pyrox.dev"
@@ -275,7 +276,7 @@ in
       servers :80 {
         listener_wrappers {
           layer4 {
-            @maildomains http host mail.pyrox.dev mta-sts.pyrox.dev autoconfig.pyrox.dev autodiscover.pyrox.dev dav.pyrox.dev
+            @maildomains http host mail.pyrox.dev mail2.pyrox.dev mta-sts.pyrox.dev autoconfig.pyrox.dev autodiscover.pyrox.dev dav.pyrox.dev
             route @maildomains {
               subroute {
                 @a http
@@ -294,7 +295,7 @@ in
       servers :443 {
         listener_wrappers {
           layer4 {
-            @maildomains tls sni mail.pyrox.dev mta-sts.pyrox.dev autoconfig.pyrox.dev autodiscover.pyrox.dev dav.pyrox.dev
+            @maildomains tls sni mail.pyrox.dev mail2.pyrox.dev mta-sts.pyrox.dev autoconfig.pyrox.dev autodiscover.pyrox.dev dav.pyrox.dev
             route @maildomains {
               proxy {
                 proxy_protocol v2
diff --git a/hosts/prefect/services/mailserver/acme.nix b/hosts/prefect/services/mailserver/acme.nix
index cd1e49f7..60b9ab79 100644
--- a/hosts/prefect/services/mailserver/acme.nix
+++ b/hosts/prefect/services/mailserver/acme.nix
@@ -8,6 +8,7 @@
     contact = [ "pyrox@pyrox.dev" ];
     domains = [
       "mail.pyrox.dev"
+      "mail2.pyrox.dev"
       "mta-sts.pyrox.dev"
       "autoconfig.pyrox.dev"
       "autodiscover.pyrox.dev"
diff --git a/hosts/prefect/services/mailserver/default.nix b/hosts/prefect/services/mailserver/default.nix
index 738a7bd5..b94aef55 100644
--- a/hosts/prefect/services/mailserver/default.nix
+++ b/hosts/prefect/services/mailserver/default.nix
@@ -79,6 +79,7 @@ in
           subjects = [
             "dav.pyrox.dev"
             "mail.pyrox.dev"
+            "mail2.pyrox.dev"
             "mta-sts.pyrox.dev"
             "autoconfig.pyrox.dev"
             "autodiscover.pyrox.dev"