diff --git a/systems/x86_64-linux/prefect/services/acme.nix b/systems/x86_64-linux/prefect/services/acme.nix
index a6d4ac2e..fd9ae812 100644
--- a/systems/x86_64-linux/prefect/services/acme.nix
+++ b/systems/x86_64-linux/prefect/services/acme.nix
@@ -5,7 +5,7 @@
     certs."pyroxdev-mail" = {
       domain = "mail.pyrox.dev";
       extraDomainNames = [
-        "mail2.pyrox.dev"
+        "dav.pyrox.dev"
         "mta-sts.pyrox.dev"
         "autoconfig.pyrox.dev"
         "autodiscover.pyrox.dev"
diff --git a/systems/x86_64-linux/prefect/services/mailserver/stalwart/auth.nix b/systems/x86_64-linux/prefect/services/mailserver/stalwart/auth.nix
index 0ef38174..0800f617 100644
--- a/systems/x86_64-linux/prefect/services/mailserver/stalwart/auth.nix
+++ b/systems/x86_64-linux/prefect/services/mailserver/stalwart/auth.nix
@@ -8,8 +8,7 @@ in
 {
   dkim = {
     sign = [
-      (ifThen "sender_domain = 'pyrox.dev'" "'rsa'")
-      (ifThen "sender_domain = 'pyrox.dev'" "'ed25519'")
+      (ifThen "sender_domain = 'pyrox.dev'" "['rsa', 'ed25519']")
       (otherwise false)
     ];
   };
diff --git a/systems/x86_64-linux/prefect/services/mailserver/stalwart/default.nix b/systems/x86_64-linux/prefect/services/mailserver/stalwart/default.nix
index e15200e7..d842b53c 100644
--- a/systems/x86_64-linux/prefect/services/mailserver/stalwart/default.nix
+++ b/systems/x86_64-linux/prefect/services/mailserver/stalwart/default.nix
@@ -77,8 +77,8 @@ in
           cert = "%{file:${credsDir}/cert}%";
           private-key = "%{file:${credsDir}/key}%";
           subjects = [
+            "dav.pyrox.dev"
             "mail.pyrox.dev"
-            "mail2.pyrox.dev"
             "mta-sts.pyrox.dev"
             "autoconfig.pyrox.dev"
             "autodiscover.pyrox.dev"