diff --git a/clusters/k2/default.nix b/clusters/k2/default.nix
index 4553fb3..5c9b2d3 100644
--- a/clusters/k2/default.nix
+++ b/clusters/k2/default.nix
@@ -3,22 +3,19 @@ let
   setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; };
 
   hosts = [
-    { name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; }
-    { name = "k2-2"; address = "10.253.18.116"; hw = ./k2-2.nix; }
-    { name = "k2-3"; address = "10.253.18.117"; hw = ./k2-3.nix; }
-    { name = "k2-4"; address = "10.253.18.118"; hw = ./k2-4.nix; }
-    { name = "k2-5"; address = "10.253.18.103"; hw = ./k2-5.nix; }
+    { name = "k2-1"; address = "10.1.8.57"; hw = ./k2-1.nix; }
+    { name = "k2-2"; address = "10.1.8.58"; hw = ./k2-2.nix; }
+    { name = "k2-3"; address = "10.1.8.59"; hw = ./k2-3.nix; }
+    { name = "k2-4"; address = "10.1.8.60"; hw = ./k2-4.nix; }
   ];
 
   customize = {
-    boot.bios = true;
+    boot.uefi = false;
   };
 
   cluster = {
     clusterName = "k2";
     initca = ./ca;
-    # domain = "itpartner.intern";
-    # searchDomains = [ "itpartner.intern" "itpartner.no" ];
 
     extraHosts = import ../hosts.nix;
 
@@ -32,7 +29,7 @@ let
       enable = true;
       master = {
         name = "k2-0";
-        address = "10.253.18.114";
+        address = "10.1.8.56";
         extraSANs = [ "k2.itpartner.no" ];
         hw = ./k2-0.nix;
       };
diff --git a/clusters/k2/k2-0.nix b/clusters/k2/k2-0.nix
index 0bc0da8..eceaa14 100644
--- a/clusters/k2/k2-0.nix
+++ b/clusters/k2/k2-0.nix
@@ -1,22 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2351b733-4de3-4ea2-a9dc-3e5eaec1cc79";
+    { device = "/dev/disk/by-uuid/b3cb0342-3f23-4744-b7d5-81bfe796f7dc";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/4347-5916";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 2;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/clusters/k2/k2-1.nix b/clusters/k2/k2-1.nix
index 9936ec6..ab7f774 100644
--- a/clusters/k2/k2-1.nix
+++ b/clusters/k2/k2-1.nix
@@ -1,22 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/77b888f2-9010-4ea1-b93b-c254b65d6d92";
+    { device = "/dev/disk/by-uuid/d005e166-d50f-4633-9077-d77ca026aedf";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/4975-538E";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 4;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/clusters/k2/k2-2.nix b/clusters/k2/k2-2.nix
index f7d4862..1ed2fda 100644
--- a/clusters/k2/k2-2.nix
+++ b/clusters/k2/k2-2.nix
@@ -1,22 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/543012dc-a688-4165-be44-dc1aae81083d";
+    { device = "/dev/disk/by-uuid/51062251-ae44-4b4d-9173-9c1c60b9a3ce";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5128-B89C";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 4;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/clusters/k2/k2-3.nix b/clusters/k2/k2-3.nix
index 97bc56a..8bee80a 100644
--- a/clusters/k2/k2-3.nix
+++ b/clusters/k2/k2-3.nix
@@ -1,22 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/fff7002b-1a39-444a-8529-c47962e786a3";
+    { device = "/dev/disk/by-uuid/a5826589-d7c9-4bf2-a7cc-1b67d977c36a";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/584C-7A39";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 4;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/clusters/k2/k2-4.nix b/clusters/k2/k2-4.nix
index 9afdade..daabb59 100644
--- a/clusters/k2/k2-4.nix
+++ b/clusters/k2/k2-4.nix
@@ -1,22 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/805a40c9-c575-4579-8c6d-9de36b44b1ca";
+    { device = "/dev/disk/by-uuid/04723aab-39c3-42ff-9714-b169de0c9e9c";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5D50-B9DF";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 4;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/clusters/k2/registry-auth-secret.yaml b/clusters/k2/registry-auth-secret.yaml
deleted file mode 100644
index 84e46ec..0000000
--- a/clusters/k2/registry-auth-secret.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-data:
-  .dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL3JlZ2lzdHJ5Lml0cGFydG5lci5ubyI6eyJ1c2VybmFtZSI6ImpvbmFzIiwicGFzc3dvcmQiOiJTRldwLVk0bkVfdXpNZFJxeHp6SyIsImF1dGgiOiJhbTl1WVhNNlUwWlhjQzFaTkc1RlgzVjZUV1JTY1hoNmVrcz0ifX19
-kind: Secret
-metadata:
-  name: registry-auth
-type: kubernetes.io/dockerconfigjson