diff --git a/.github/workflows/helm-charts-test.yaml b/.github/workflows/helm-charts-test.yaml
index dba001a..795caad 100644
--- a/.github/workflows/helm-charts-test.yaml
+++ b/.github/workflows/helm-charts-test.yaml
@@ -45,10 +45,9 @@ jobs:
       - name: Create kind cluster
         uses: helm/kind-action@v1.10.0
         with:
-          installLocalPathProvisioner: true # Only build a kind cluster if there are chart changes to test.
           node_image: "kindest/node:v${{ matrix.k8s }}.0"
           config: etc/kind.yaml
-      - run: kubectl get nodes
+      - run: kubectl get nodes --show-labels=true
       - run: kubectl get pods -A
       - run: kubectl get svc -A
       - name: Install PiHole
diff --git a/etc/kind.yaml b/etc/kind.yaml
index 2dcdccc..5d1fc65 100644
--- a/etc/kind.yaml
+++ b/etc/kind.yaml
@@ -2,30 +2,62 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
   - role: control-plane
-    kubeadmConfigPatches:
-      - |
-        kind: JoinConfiguration
-        nodeRegistration:
-          kubeletExtraArgs:
-            node-labels: "wyrihaximus.net/type=leader"
-  - role: worker
-    kubeadmConfigPatches:
-      - |
-        kind: JoinConfiguration
-        nodeRegistration:
-          kubeletExtraArgs:
-            node-labels: "wyrihaximus.net/type=worker"
-  - role: worker
-    kubeadmConfigPatches:
-      - |
-        kind: JoinConfiguration
-        nodeRegistration:
-          kubeletExtraArgs:
-            node-labels: "wyrihaximus.net/type=ingress"
-  - role: worker
-    kubeadmConfigPatches:
-      - |
-        kind: JoinConfiguration
-        nodeRegistration:
-          kubeletExtraArgs:
-            node-labels: "wyrihaximus.net/type=poen"
+    labels:
+      "topology.kubernetes.io/region": Kalimdor
+      "topology.kubernetes.io/zone": Orgrimmar
+      "wyrihaximus.net/type": leader
+  - role: control-plane
+    labels:
+      "topology.kubernetes.io/region": Kalimdor
+      "topology.kubernetes.io/zone": Thunderbluff
+      "wyrihaximus.net/type": leader
+  - role: control-plane
+    labels:
+      "topology.kubernetes.io/region": Eastern_Kingdoms
+      "topology.kubernetes.io/zone": The_Undercity
+      "wyrihaximus.net/type": leader
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Kalimdor
+      "topology.kubernetes.io/zone": Crossroads
+      "wyrihaximus.net/type": worker
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Kalimdor
+      "topology.kubernetes.io/zone": Gadgetzan
+      "wyrihaximus.net/type": worker
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Eastern_Kingdoms
+      "topology.kubernetes.io/zone": Booty_Bay
+      "wyrihaximus.net/type": worker
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Draenor
+      "topology.kubernetes.io/zone": The_Dark_Portal
+      "wyrihaximus.net/type": ingress
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Kalimdor
+      "topology.kubernetes.io/zone": Schnottz's_Landing
+      "wyrihaximus.net/type": ingress
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Northrend
+      "topology.kubernetes.io/zone": Moa'ki_Harbor
+      "wyrihaximus.net/type": ingress
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Eastern_Kingdoms
+      "topology.kubernetes.io/zone": Eastvale_Logging_Camp
+      "wyrihaximus.net/type": poen
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Kalimdor
+      "topology.kubernetes.io/zone": Kor'kron_lumber_yard
+      "wyrihaximus.net/type": poen
+  - role: worker
+    labels:
+      "topology.kubernetes.io/region": Lost Isles
+      "topology.kubernetes.io/zone": Bilgewater_Lumber_Yard
+      "wyrihaximus.net/type": poen