diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix
index f192bb3..b36c04c 100644
--- a/modules/system/services/server/mailserver/simplenix/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/default.nix
@@ -7,7 +7,12 @@
 
   mailserver = rec {
     enable = true;
-    domains = [ "${config.secrets.jimDomain}" ];
+    domains = [
+      "${config.secrets.jimDomain}"
+      "${config.secrets.jimDomain2}"
+      "${config.secrets.lunaDomain}"
+      "${config.secrets.cornDomain}"
+    ];
     fqdn = "mx.${config.secrets.jimDomain}";
     certificateScheme = "acme-nginx";
     localDnsResolver = false;
@@ -26,9 +31,15 @@
         hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
         sendOnly = true;
       };    
-      "jimbo@${config.secrets.jimDomain}" = {
+      "jimbo@${config.secrets.jimDomain2}" = {
         hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
-        aliases = [ "james@${config.secrets.jimDomain}" "contact@${config.secrets.jimDomain}" ];
+        aliases = [
+	  "jimbo@${config.secrets.jimDomain}"
+	  "james@${config.secrets.jimDomain}"
+	  "james@${config.secrets.jimDomain2}"
+	  "contact@${config.secrets.jimDomain}"
+	  "contact@${config.secrets.jimDomain2}"
+        ];
       };
       "luna@${config.secrets.lunaDomain}" = {
         hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
diff --git a/variables/secrets/default.nix b/variables/secrets/default.nix
index 1215c21..0cbd023 100644
Binary files a/variables/secrets/default.nix and b/variables/secrets/default.nix differ