diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index cbb9da7c..36c73dd9 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -27,7 +27,7 @@
             path = "rpool/safe/data";
             remotePath = "zdata/recv/kholinar/safe/data";
             fast = true;
-            location = "lasting-integrity";
+            location = "elendel";
           }
         ];
         rootDataset = "rpool/local/root";
diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix
index 8188bc43..30284272 100644
--- a/machines/lasting-integrity/default.nix
+++ b/machines/lasting-integrity/default.nix
@@ -24,7 +24,6 @@
           };
           internalIPV4 = "192.168.0.2";
         };
-        wireguard.server = true;
       };
       nix.enableDirenv = false;
       zfs = {
diff --git a/machines/marabethia/default.nix b/machines/marabethia/default.nix
index 3a935f59..c2aa936b 100644
--- a/machines/marabethia/default.nix
+++ b/machines/marabethia/default.nix
@@ -25,6 +25,7 @@
           internalInterface = "eno2";
           internalIPV4 = "192.168.0.3";
         };
+        wireguard.server = true;
       };
       nix.enableDirenv = true;
       zfs = {
diff --git a/modules/darwin/base/wireguard/default.nix b/modules/darwin/base/wireguard/default.nix
index eaded518..be683f24 100644
--- a/modules/darwin/base/wireguard/default.nix
+++ b/modules/darwin/base/wireguard/default.nix
@@ -14,10 +14,10 @@ in
   #   peers = [
   #     {
   #       allowedIPs = [ subnet ];
-  #       endpoint = "lasting-integrity.vanpetegem.me:51820";
+  #       endpoint = "marabethia.vanpetegem.me:51820";
   #       presharedKeyFile = pskFile;
   #       persistentKeepalive = 25;
-  #       publicKey = data.lasting-integrity.pubkey;
+  #       publicKey = data.marabethia.pubkey;
   #     }
   #   ];
   #   privateKeyFile = data.${config.networking.hostName}.privkeyFile;
diff --git a/modules/nixos/base/network/wireguard.nix b/modules/nixos/base/network/wireguard.nix
index b4efd284..0e7ddd27 100644
--- a/modules/nixos/base/network/wireguard.nix
+++ b/modules/nixos/base/network/wireguard.nix
@@ -66,9 +66,9 @@ in
               (builtins.filter (name: name != config.networking.hostName) (builtins.attrNames data)))
           else
             ([{
-              PublicKey = data.lasting-integrity.pubkey;
+              PublicKey = data.marabethia.pubkey;
               AllowedIPs = subnet;
-              Endpoint = "lasting-integrity.vanpetegem.me:51820";
+              Endpoint = "marabethia.vanpetegem.me:51820";
               PresharedKeyFile = pskFile;
               PersistentKeepalive = 25;
             }]);
@@ -78,7 +78,7 @@ in
         name = "wg0";
         address = [ "${data.${config.networking.hostName}.ip}/32" ];
         domains = [ "internal" ];
-        dns = [ data.lasting-integrity.ip ];
+        dns = [ data.marabethia.ip ];
         linkConfig.MTUBytes = "1342";
         routes = [
           (
@@ -86,7 +86,7 @@ in
               Gateway = "${data.${config.networking.hostName}.ip}";
               Destination = subnet;
             } else {
-              Gateway = "${data.lasting-integrity.ip}";
+              Gateway = "${data.marabethia.ip}";
               Destination = subnet;
               GatewayOnLink = true;
             }
diff --git a/modules/shared/base/zfs/default.nix b/modules/shared/base/zfs/default.nix
index bec727e4..8df5b29e 100644
--- a/modules/shared/base/zfs/default.nix
+++ b/modules/shared/base/zfs/default.nix
@@ -39,7 +39,7 @@
         path = "rpool/safe/data";
         remotePath = "zdata/recv/<hostname>/safe/data";
         fast = false;
-        location = "lasting-integrity.vanpetegem.me";
+        location = "marabethia.vanpetegem.me";
       }];
     };
     rootDataset = lib.mkOption {