diff --git a/hosts/siit-dc/state.nix b/hosts/siit-dc/state.nix
index f7841c0..ce409c3 100644
--- a/hosts/siit-dc/state.nix
+++ b/hosts/siit-dc/state.nix
@@ -1,6 +1,25 @@
 { lib, modulesPath, ... }:
 {
-  boot.loader.grub.devices = [ "/dev/sda" ];
+  systemd.network.enable = true;
+  systemd.network.networks."10-wan" = {
+    matchConfig.Name = "enp1s0";
+    networkConfig.DHCP = "ipv4";
+    address = [
+      "2a01:4f9:c013:bd27::1/64"
+    ];
+    routes = [
+      { Gateway = "fe80::1"; }
+    ];
+  };
+
+  boot.loader = {
+    efi.canTouchEfiVariables = false;
+    systemd-boot.enable = false;
+    grub = {
+      enable = true;
+      devices = [ "/dev/sda" ];
+    };
+  };
   system.stateVersion = "25.05";
 
   imports = [
@@ -20,7 +39,5 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  networking.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/servers/siit-dc.nix b/servers/siit-dc.nix
index efa8f33..7ddb903 100644
--- a/servers/siit-dc.nix
+++ b/servers/siit-dc.nix
@@ -4,19 +4,24 @@
     jool = {
       enable = true;
       siit.default = {
-        global.pool6 = "${config.custom.gua_pref}46::/96";
+        global.pool6 = "2a01:4f9:c013:bd27:46::/96";
 
         # Explicit address mappings
         eamt = [
+          {
+            # Cache/CI
+            "ipv6 prefix" = "${config.custom.gua_pref}d2:be24:11ff:fe7f:f84c/128";
+            "ipv4 prefix" = "95.217.30.123/32";
+          }
           {
             # Forgejo
             "ipv6 prefix" = "${config.custom.gua_pref}d2:be24:11ff:feee:9c55/128";
-            "ipv4 prefix" = "157.180.86.116/32";
+            "ipv4 prefix" = "95.216.180.210/32";
           }
           {
             # Idacloud
             "ipv6 prefix" = "${config.custom.gua_pref}d3:be24:11ff:fece:7d63/128";
-            "ipv4 prefix" = "95.216.180.210/32";
+            "ipv4 prefix" = "95.217.26.243/32";
           }
         ];
       };
diff --git a/shared/disko/hetzner-ext4.nix b/shared/disko/hetzner-ext4.nix
index 44bae35..fb12228 100644
--- a/shared/disko/hetzner-ext4.nix
+++ b/shared/disko/hetzner-ext4.nix
@@ -5,19 +5,22 @@
         device = "/dev/sda";
         type = "disk";
         content = {
-          type = "msdos";
-          partitions = {
-            root = {
+          type = "table";
+          format = "msdos";
+          partitions = [
+            {
               name = "nixos";
+              part-type = "primary";
               bootable = true;
-              size = "100%";
+              start = "1M";
+              end = "100%";
               content = {
                 type = "filesystem";
                 format = "ext4";
                 mountpoint = "/";
               };
-            };
-          };
+            }
+          ];
         };
       };
     };