diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index f24eb3f7..8979eda9 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -10,10 +10,8 @@ data:
   hostname: n0
   ip: 192.168.77.10
   labels:
-    static:
-      - calico-etcd=enabled
-      - node-role.kubernetes.io/master=
     dynamic:
+      - calico-etcd=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml
index 0261edfb..c4e56bc6 100644
--- a/examples/basic/HostSystem.yaml
+++ b/examples/basic/HostSystem.yaml
@@ -13,7 +13,7 @@ data:
       tar_path: kubernetes/node/bin/kubelet
       mode: 0555
   images:
-    coredns: coredns/coredns:011
+    coredns: coredns/coredns:0.9.9
     helm:
       helm: lachlanevenson/k8s-helm:v2.5.1
     kubernetes:
diff --git a/examples/basic/joining-host-config.yaml b/examples/basic/joining-host-config.yaml
index 648e473e..6fe165e8 100644
--- a/examples/basic/joining-host-config.yaml
+++ b/examples/basic/joining-host-config.yaml
@@ -26,8 +26,6 @@ data:
   ip: 192.168.77.11
   join_ip: 192.168.77.10
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - kubernetes-apiserver=enabled
@@ -48,8 +46,6 @@ data:
   ip: 192.168.77.12
   join_ip: 192.168.77.10
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - kubernetes-apiserver=enabled
@@ -70,8 +66,6 @@ data:
   ip: 192.168.77.13
   join_ip: 192.168.77.11
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - kubernetes-apiserver=enabled
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index b37ff772..6b275a83 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -10,10 +10,8 @@ data:
   hostname: n0
   ip: 192.168.77.10
   labels:
-    static:
-      - calico-etcd=enabled
-      - node-role.kubernetes.io/master=
     dynamic:
+      - calico-etcd=enabled
       - ceph-mds=enabled
       - ceph-mon=enabled
       - ceph-osd=enabled
diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml
index 7ff17c05..d066a72c 100644
--- a/examples/complete/HostSystem.yaml
+++ b/examples/complete/HostSystem.yaml
@@ -13,7 +13,7 @@ data:
       tar_path: kubernetes/node/bin/kubelet
       mode: 0555
   images:
-    coredns: coredns/coredns:011
+    coredns: coredns/coredns:0.9.9
     helm:
       helm: lachlanevenson/k8s-helm:v2.5.1
     kubernetes:
diff --git a/examples/complete/joining-host-config.yaml b/examples/complete/joining-host-config.yaml
index 1ad06de0..b963775a 100644
--- a/examples/complete/joining-host-config.yaml
+++ b/examples/complete/joining-host-config.yaml
@@ -30,8 +30,6 @@ data:
   ip: 192.168.77.11
   join_ip: 192.168.77.10
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - ceph-mds=enabled
@@ -56,8 +54,6 @@ data:
   ip: 192.168.77.12
   join_ip: 192.168.77.10
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - ceph-mds=enabled
@@ -82,8 +78,6 @@ data:
   ip: 192.168.77.13
   join_ip: 192.168.77.11
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - ceph-mds=enabled
diff --git a/promenade/schemas/Genesis.yaml b/promenade/schemas/Genesis.yaml
index 0e70db8b..17d18ecf 100644
--- a/promenade/schemas/Genesis.yaml
+++ b/promenade/schemas/Genesis.yaml
@@ -78,8 +78,6 @@ data:
           type: array
           items:
             $ref: '#/definitions/kubernetes_label'
-      required:
-        - static
       additionalProperties: false
 
     images:
diff --git a/promenade/templates/include/utils.sh b/promenade/templates/include/utils.sh
index c0d7d1bc..b7d7e638 100644
--- a/promenade/templates/include/utils.sh
+++ b/promenade/templates/include/utils.sh
@@ -234,7 +234,7 @@ spec:
     kubernetes.io/hostname: ${NODE}
   containers:
   - name: noisy
-    image: busybox
+    image: busybox:1.27.1
     imagePullPolicy: IfNotPresent
     command:
     - /bin/echo
diff --git a/promenade/templates/roles/join/etc/kubernetes/manifests/.placeholder b/promenade/templates/roles/join/etc/kubernetes/manifests/.placeholder
index e69de29b..fdffa2a0 100644
--- a/promenade/templates/roles/join/etc/kubernetes/manifests/.placeholder
+++ b/promenade/templates/roles/join/etc/kubernetes/manifests/.placeholder
@@ -0,0 +1 @@
+# placeholder
diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml
index 2af3b500..3a2e0f72 100644
--- a/tools/gate/config-templates/bootstrap-armada-config.yaml
+++ b/tools/gate/config-templates/bootstrap-armada-config.yaml
@@ -487,7 +487,10 @@ data:
     no_hooks: true
   values:
     coredns:
-      cluster_domain: cluster.local
+      kubernetes_zones:
+        - cluster.local
+        - 10.96.0.0/16
+        - 10.97.0.0/16
       upstream_nameservers:
         - 8.8.8.8
         - 8.8.4.4
diff --git a/tools/gate/config-templates/genesis-config.yaml b/tools/gate/config-templates/genesis-config.yaml
index 3908bca7..e8b2c13c 100644
--- a/tools/gate/config-templates/genesis-config.yaml
+++ b/tools/gate/config-templates/genesis-config.yaml
@@ -10,10 +10,8 @@ data:
   hostname: ${GENESIS_HOSTNAME}
   ip: ${GENESIS_IP}
   labels:
-    static:
-      - calico-etcd=enabled
-      - node-role.kubernetes.io/master=
     dynamic:
+      - calico-etcd=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
diff --git a/tools/gate/config-templates/joining-host-config.yaml b/tools/gate/config-templates/joining-host-config.yaml
index 62ee3a38..a8dc2987 100644
--- a/tools/gate/config-templates/joining-host-config.yaml
+++ b/tools/gate/config-templates/joining-host-config.yaml
@@ -11,8 +11,6 @@ data:
   ip: ${GENESIS_IP}
   join_ip: ${MASTER1_IP}
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - ceph-mds=enabled
@@ -40,8 +38,6 @@ data:
   ip: ${MASTER1_IP}
   join_ip: ${GENESIS_IP}
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - ceph-mds=enabled
@@ -69,8 +65,6 @@ data:
   ip: ${MASTER2_IP}
   join_ip: ${GENESIS_IP}
   labels:
-    static:
-      - node-role.kubernetes.io/master=
     dynamic:
       - calico-etcd=enabled
       - ceph-mds=enabled
diff --git a/tools/gate/config-templates/site-config.yaml b/tools/gate/config-templates/site-config.yaml
index 938ddba4..04c130df 100644
--- a/tools/gate/config-templates/site-config.yaml
+++ b/tools/gate/config-templates/site-config.yaml
@@ -12,6 +12,7 @@ data:
     service_ip: 10.96.0.10
     bootstrap_validation_checks:
       - calico-etcd.kube-system.svc.cluster.local
+      - google.com
       - kubernetes-etcd.kube-system.svc.cluster.local
       - kubernetes.default.svc.cluster.local
     upstream_servers: