diff --git a/modules/nixos/services/authentication/zitadel/default.nix b/modules/nixos/services/authentication/zitadel/default.nix
index 7edccc1..3b2a4a3 100644
--- a/modules/nixos/services/authentication/zitadel/default.nix
+++ b/modules/nixos/services/authentication/zitadel/default.nix
@@ -28,7 +28,7 @@ in
         settings = {
           Port = 9092;
 
-          ExternalDomain = "auth.amarth.cloud";
+          ExternalDomain = "auth.kruining.eu";
           ExternalPort = 443;
           ExternalSecure = true;
 
@@ -60,7 +60,7 @@ in
             SMTPConfiguration = {
               SMTP = {
                 Host = "black-mail.nl:587";
-                User = "info@amarth.cloud";
+                User = "chris@kruining.eu";
                 Password = "__TODO_USE_SOPS__";
               };
               FromName = "Amarth Zitadel";
@@ -84,7 +84,7 @@ in
         };
         steps = {
           FirstInstance = {
-            InstanceName = "auth.amarth.cloud";
+            InstanceName = "auth.kruining.eu";
             Org = {
               Name = "Amarth";
               Human = {
@@ -116,7 +116,7 @@ in
       caddy = {
         enable = true;
         virtualHosts = {
-          "auth.amarth.cloud".extraConfig = ''
+          "auth.kruining.eu".extraConfig = ''
             reverse_proxy h2c://127.0.0.1:9092
           '';
         };
diff --git a/modules/nixos/services/communication/matrix/default.nix b/modules/nixos/services/communication/matrix/default.nix
index d0c6e45..38dfe0c 100644
--- a/modules/nixos/services/communication/matrix/default.nix
+++ b/modules/nixos/services/communication/matrix/default.nix
@@ -55,7 +55,7 @@ in
 
               idp_id = "zitadel";
               idp_name = "Zitadel";
-              issuer = "https://auth.amarth.cloud";
+              issuer = "https://auth.kruining.eu";
               client_id = "337858153251143939";
               client_secret = "ePkf5n8BxGD5DF7t1eNThTL0g6PVBO5A1RC0EqPp61S7VsiyXvDs8aJeczrpCpsH";
               scopes = [ "openid" "profile" ];
@@ -159,7 +159,7 @@ in
           };
           client = {
             "m.homeserver".base_url = "https://${fqn}";
-            "m.identity_server".base_url = "https://auth.amarth.cloud";
+            "m.identity_server".base_url = "https://auth.kruining.eu";
           };
         in {
           "${domain}".extraConfig = ''
diff --git a/modules/nixos/services/media/homer/default.nix b/modules/nixos/services/media/homer/default.nix
index 8fd0ac6..41535cd 100644
--- a/modules/nixos/services/media/homer/default.nix
+++ b/modules/nixos/services/media/homer/default.nix
@@ -37,7 +37,7 @@ in
                   name = "Zitadel";
                   logo = "https://cdn.jsdelivr.net/gh/selfhst/icons/svg/zitadel.svg";
                   tag = "app";
-                  url = "https://auth.amarth.cloud";
+                  url = "https://auth.kruining.eu";
                   target = "_blank";
                 }
 
diff --git a/modules/nixos/services/observability/grafana/default.nix b/modules/nixos/services/observability/grafana/default.nix
index c399729..6503493 100644
--- a/modules/nixos/services/observability/grafana/default.nix
+++ b/modules/nixos/services/observability/grafana/default.nix
@@ -42,9 +42,9 @@ in
             login_attribute_path = "username";
             name_attribute_path = "full_name";
             role_attribute_path = "contains(urn:zitadel:iam:org:project:roles[*], 'owner') && 'GrafanaAdmin' || contains(urn:zitadel:iam:org:project:roles[*], 'contributer') && 'Editor' || 'Viewer'";
-            auth_url = "https://auth.amarth.cloud/oauth/v2/authorize";
-            token_url = "https://auth.amarth.cloud/oauth/v2/token";
-            api_url = "https://auth.amarth.cloud/oidc/v1/userinfo";
+            auth_url = "https://auth.kruining.eu/oauth/v2/authorize";
+            token_url = "https://auth.kruining.eu/oauth/v2/token";
+            api_url = "https://auth.kruining.eu/oidc/v1/userinfo";
             allow_sign_up = true;
             auto_login = true;
             use_pkce = true;
diff --git a/modules/nixos/services/security/vaultwarden/default.nix b/modules/nixos/services/security/vaultwarden/default.nix
index db8e162..de50be7 100644
--- a/modules/nixos/services/security/vaultwarden/default.nix
+++ b/modules/nixos/services/security/vaultwarden/default.nix
@@ -39,7 +39,7 @@ in
           SSO_ROLES_ENABLED = true;
           SSO_ORGANIZATIONS_ENABLED = true;
           SSO_ORGANIZATIONS_REVOCATION = true;
-          SSO_AUTHORITY = "https://auth.amarth.cloud/";
+          SSO_AUTHORITY = "https://auth.kruining.eu/";
           SSO_SCOPES = "email profile offline_access";
           SSO_AUDIENCE_TRUSTED = "^333297815511892227$";
           SSO_CLIENT_ID = "335178854421299459";
@@ -52,9 +52,9 @@ in
           SMTP_HOST = "black-mail.nl";
           SMTP_PORT = 587;
           SMTP_SECURITY = "starttls";
-          SMTP_USERNAME = "info@amarth.cloud";
+          SMTP_USERNAME = "chris@kruining.eu";
           SMTP_PASSWORD = "";
-          SMTP_FROM = "info@amarth.cloud";
+          SMTP_FROM = "chris@kruining.eu";
           SMTP_FROM_NAME = "Chris' Vaultwarden";
         };
       };
diff --git a/systems/x86_64-linux/ulmo/default.nix b/systems/x86_64-linux/ulmo/default.nix
index 0f3ac1c..a601960 100644
--- a/systems/x86_64-linux/ulmo/default.nix
+++ b/systems/x86_64-linux/ulmo/default.nix
@@ -5,14 +5,24 @@
     ./hardware.nix
   ];
 
-  networking.interfaces.enp2s0 = {
-    ipv6.addresses = [
-      { address = "2a0d:6e00:1dc9:0::dead:beef"; prefixLength = 64; }
-    ];
+  networking = {
+    interfaces.enp2s0 = {
+      ipv6.addresses = [
+        { address = "2a0d:6e00:1dc9:0::dead:beef"; prefixLength = 64; }
+      ];
 
-    ipv4.addresses = [
-      { address = "192.168.1.3"; prefixLength = 16; }
-    ];
+      useDHCP = true;
+    };
+
+    defaultGateway = {
+      address = "192.168.1.1";
+      interface = "enp2s0";
+    };
+
+    defaultGateway6 = {
+      address = "fe80::1";
+      interface = "enp2s0";
+    };
   };
 
   sneeuwvlok = {
diff --git a/systems/x86_64-linux/ulmo/disks.nix b/systems/x86_64-linux/ulmo/disks.nix
index a4033f7..0b272f4 100644
--- a/systems/x86_64-linux/ulmo/disks.nix
+++ b/systems/x86_64-linux/ulmo/disks.nix
@@ -5,9 +5,7 @@ in
 {
   # TODO :: Implement disko at some point
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/0ddf001a-5679-482e-b254-04a1b9094794"; }
-  ];
+  swapDevices = [];
 
   boot.supportedFilesystems = [ "nfs" ];