diff --git a/systems/x86_64-linux/mx/mailserver.nix b/systems/x86_64-linux/mx/mailserver.nix
index 7c00dc5..9c7711f 100644
--- a/systems/x86_64-linux/mx/mailserver.nix
+++ b/systems/x86_64-linux/mx/mailserver.nix
@@ -54,73 +54,90 @@
       "zu@ublre.klm" = {
         hashedPasswordFile = "/ubzr/unenyq/frpergf/zu@ublre.klm";
         aliases = [
-          "zrvxr@zrvxr-ublre.qr"
           "zrvxr@unenyq-ublre.qr"
+          "zrvxr@ublre.fbpvny"
+          "zrvxr@ublre.jbeyq"
           "zrvxr@ublre.klm"
+          "zrvxr@zrvxr-ublre.qr"
         ];
       };
       "nyrk@ublre.klm" = {
         hashedPasswordFile = "/home/hartwin/secrets/alex-mail";
         aliases = [
-          "nyrk@unegjva-ublre.qr"
           "nyrk.ublre@unegjva-ublre.qr"
-          "nyrk@fhesfvgr.bet"
           "nyrk.ublre@fhesfvgr.bet"
+          "nyrk@unegjva-ublre.qr"
+          "nyrk@ublre.fbpvny"
+          "nyrk@ublre.jbeyq"
+          "nyrk@fhesfvgr.bet"
+          "nyrknaqre@ublre.fbpvny"
+          "nyrknaqre@ublre.jbeyq"
           "nyrknaqre@ublre.klm"
         ];
       };
       "wna@ublre.klm" = {
         hashedPasswordFile = "/home/hartwin/secrets/jan-mail";
         aliases = [
-          "wna@unegjva-ublre.qr"
           "wna.ublre@unegjva-ublre.qr"
-          "wna@fhesfvgr.bet"
           "wna.ublre@fhesfvgr.bet"
+          "wna@unegjva-ublre.qr"
+          "wna@ublre.fbpvny"
+          "wna@ublre.jbeyq"
+          "wna@fhesfvgr.bet"
         ];
       };
       "unaanu@ublre.klm" = {
         hashedPasswordFile = "/home/hartwin/secrets/hannah-mail";
         aliases = [
-          "unaanu@unegjva-ublre.qr"
           "unaanu.ublre@unegjva-ublre.qr"
-          "unaanu@fhesfvgr.bet"
           "unaanu.ublre@fhesfvgr.bet"
+          "unaanu@unegjva-ublre.qr"
+          "unaanu@ublre.fbpvny"
+          "unaanu@ublre.jbeyq"
+          "unaanu@fhesfvgr.bet"
         ];
       };
       "fgrssv@ublre.klm" = {
         hashedPasswordFile = "/home/hartwin/secrets/steffi-mail";
         aliases = [
-          "fgrssv@fhesfvgr.bet"
-          "fgrsnavrublre@fhesfvgr.bet"
-          "fgrsnavr.ublre@fhesfvgr.bet"
           "fgrsnavr.ublre@ublre.klm"
+          "fgrsnavr.ublre@fhesfvgr.bet"
+          "fgrsnavr@ublre.fbpvny"
+          "fgrsnavr@ublre.jbeyq"
           "fgrsnavr@ublre.klm"
+          "fgrsnavrublre@fhesfvgr.bet"
+          "fgrssv@fhesfvgr.bet"
         ];
       };
       "unegjva@ublre.klm" = {
         hashedPasswordFile = "/home/hartwin/secrets/hartwin-mail";
         aliases = [
           "unegjva.ublre@unegjva-ublre.qr"
-          "znvy@unegjva-ublre.qr"
           "unegjva@unegjva-ublre.qr"
-          "lbhghor@unegjva-ublre.qr"
-          "unegjva@ap.ublre.klm"
           "unegjva@ublre.cubgbf"
+          "unegjva@ublre.fbpvny"
+          "unegjva@ublre.jbeyq"
+          "unegjva@ap.ublre.klm"
+          "znvy@unegjva-ublre.qr"
           "jroznfgre@unegjva.ublre.cubgbf"
+          "jroznfgre@unegjva.ublre.klm"
+          "lbhghor@unegjva-ublre.qr"
         ];
       };
       "uublre@urejneq-ublre.qr" = {
         hashedPasswordFile = "/home/hhoyer/secrets/hhoyer-mail";
         aliases = [
-          "urejneq@urejneq-ublre.qr"
-          "urejneq@if189018.ifreire.qr"
           "thn808@urejneq-ublre.qr"
-          "znvy@urejneq-ublre.qr"
           "urejneq.ublre@urejneq-ublre.qr"
-          "uublre@fhesfvgr.bet"
-          "uublre@ublre.klm"
+          "urejneq@urejneq-ublre.qr"
+          "urejneq@ublre.fbpvny"
+          "urejneq@ublre.jbeyq"
           "urejneq@ublre.klm"
           "urejneq@ap.ublre.klm"
+          "urejneq@if189018.ifreire.qr"
+          "uublre@ublre.klm"
+          "uublre@fhesfvgr.bet"
+          "znvy@urejneq-ublre.qr"
         ];
       };
       "unenyq@ublre.klm" = {