diff --git a/clusters/fs0/default.nix b/clusters/fs0/default.nix
index 40e22e7..60adaea 100644
--- a/clusters/fs0/default.nix
+++ b/clusters/fs0/default.nix
@@ -9,26 +9,7 @@ let
   cluster = {
     initca = ./ca;
     clusterName = "fs0";
-    extraHosts = ''
-      10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
-
-      10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
-      10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
-      10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
-
-      10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
-      10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
-      10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
-      10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
-      10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
-
-      10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
-      10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
-      10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
-      10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
-      10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
-      10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
-    '';
+    extraHosts = import ../hosts.nix;
 
     adminAuthorizedKeys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
diff --git a/clusters/k0/default.nix b/clusters/k0/default.nix
index a8da99e..4509c88 100644
--- a/clusters/k0/default.nix
+++ b/clusters/k0/default.nix
@@ -35,8 +35,9 @@ let
       };
       nodes = hosts;
       cidr = "10.11.0.0/16";
+      extraIngressNodes = [ "k0-1" "k0-2" ];
       fileserver = "fs0-0";
-      bootstrap = {
+      charts = {
         acme_email = "innovasjon@itpartner.no";
         grafana_smtp_user = "utvikling";
         grafana_smtp_password = "S0m3rp0m@de#21!";
diff --git a/clusters/k1/default.nix b/clusters/k1/default.nix
index ad79f5b..79de0d3 100644
--- a/clusters/k1/default.nix
+++ b/clusters/k1/default.nix
@@ -38,7 +38,7 @@ let
       nodes = hosts;
       cidr = "10.11.0.0/16";
       fileserver = "fs0-0";
-      bootstrap = {
+      charts = {
         acme_email = "innovasjon@itpartner.no";
         grafana_smtp_user = "utvikling";
         grafana_smtp_password = "S0m3rp0m@de#21!";
diff --git a/clusters/k2/default.nix b/clusters/k2/default.nix
index 88d92a5..9b5a9e3 100644
--- a/clusters/k2/default.nix
+++ b/clusters/k2/default.nix
@@ -39,7 +39,7 @@ let
       nodes = hosts;
       cidr = "10.11.0.0/16";
       fileserver = "fs0-0";
-      bootstrap = {
+      charts = {
         acme_email = "innovasjon@itpartner.no";
         grafana_smtp_user = "utvikling";
         grafana_smtp_password = "S0m3rp0m@de#21!";