diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index 19439f2..195782c 100644
Binary files a/modules/system/secrets/default.nix and b/modules/system/secrets/default.nix differ
diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix
index 41cd3cf..b12bc42 100644
--- a/modules/system/services/server/mailserver/simplenix/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/default.nix
@@ -28,26 +28,27 @@
         hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
         aliases = [
           "james@${config.domains.p2}"
-          "jimjam4real@${config.domains.p2}"
+          "jimbo@${config.domains.blox}"
 
           "vice@${config.domains.p2}"
-          "vicee@${config.domains.p2}"
-          "viceebun@${config.domains.p2}"
+          "vice@${config.domains.blox}"
           "yara@${config.domains.p2}"
-          "yaralis@${config.domains.p2}"
 
           "contact@${config.domains.p2}"
         ];
       };
       "luna@${config.domains.luna}" = {
         hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
-        aliases = [ "luna@${config.domains.blox}" ];
+        aliases = [
+          "luna@${config.domains.blox}"
+          "contact@${config.domains.blox}"
+          "ibu@${config.domains.blox}"
+        ];
       };
-      "corn@${config.domains.corn}" = {
+      "contact@${config.domains.corn}" = {
         hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
-        aliases = [ "corn@${config.domains.blox}" ];
+        aliases = [ "freecorn@${config.domains.blox}" ];
       };
-      "tiny@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
     };
   };