diff --git a/argocd/service.yaml b/argocd/service.yaml
index 9b7377c..c1e34f1 100644
--- a/argocd/service.yaml
+++ b/argocd/service.yaml
@@ -7,8 +7,8 @@ spec:
   type: ClusterIP
   clusterIP: 10.0.91.81
   clusterIPs:
-    - 10.0.91.81
     - fd00:0:0:f:1::81
+    - 10.0.91.81
   ipFamilies:
     - IPv4
     - IPv6
diff --git a/calico-config/whisker.yaml b/calico-config/whisker.yaml
index b74cf56..726cbec 100644
--- a/calico-config/whisker.yaml
+++ b/calico-config/whisker.yaml
@@ -7,8 +7,8 @@ spec:
   type: ClusterIP
   clusterIP: 10.0.91.82
   clusterIPs:
-    - 10.0.91.82
     - fd00:0:0:f:1::82
+    - 10.0.91.82
   ipFamilies:
     - IPv4
     - IPv6
@@ -18,4 +18,4 @@ spec:
       port: 8081
       targetPort: 8081
   selector:
-    k8s-app: whisker
+    app.kubernetes.io/name: whisker
diff --git a/terraform/control-plane1.bu b/terraform/control-plane1.bu
index ac9d713..1deb633 100644
--- a/terraform/control-plane1.bu
+++ b/terraform/control-plane1.bu
@@ -194,8 +194,8 @@ storage:
             ipFamilies: [IPv4, IPv6]
             clusterIP: 10.0.91.53
             clusterIPs:
-              - 10.0.91.53
               - fd00:0:0:f:1::53
+              - 10.0.91.53
             ports:
               - name: dns
                 port: 53
@@ -465,9 +465,9 @@ systemd:
           kubectl -n kube-system delete svc kube-dns --ignore-not-found ; \
           kubectl apply -f /etc/kubernetes/addons/kube-dns-fixed-svc.yaml ; \
           kubectl -n argocd delete svc argocd-server --ignore-not-found ; \
-          kubectl apply -f http://gitea.gitea.svc.k8aux.undercloud.cf:3000/undercloud/k8aux-apps/raw/branch/main/argocd/service.yaml ; \
+          kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/argocd/service.yaml ; \
           kubectl -n calico-system delete svc whisker --ignore-not-found || true ; \
-          kubectl apply -f http://gitea.gitea.svc.k8aux.undercloud.cf:3000/undercloud/k8aux-apps/raw/branch/main/calico-config/whisker.yaml || true ; \
+          kubectl create -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/whisker.yaml || true ; \
           echo "[pin-service-ips] done." \
         '
 
diff --git a/terraform/control-plane2.bu b/terraform/control-plane2.bu
index 61bfc22..44721d1 100644
--- a/terraform/control-plane2.bu
+++ b/terraform/control-plane2.bu
@@ -146,6 +146,7 @@ storage:
             criSocket: unix:///run/containerd/containerd.sock
             kubeletExtraArgs:
               node-ip: "fd00:0:0:2::92"
+              cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
               volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
           discovery:
             bootstrapToken:
diff --git a/terraform/control-plane3.bu b/terraform/control-plane3.bu
index d7289ea..b731fb0 100644
--- a/terraform/control-plane3.bu
+++ b/terraform/control-plane3.bu
@@ -146,6 +146,7 @@ storage:
             criSocket: unix:///run/containerd/containerd.sock
             kubeletExtraArgs:
               node-ip: "fd00:0:0:2::93"
+              cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
               volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
           discovery:
             bootstrapToken:
diff --git a/terraform/worker1.bu b/terraform/worker1.bu
index 587bf5b..1328aaf 100644
--- a/terraform/worker1.bu
+++ b/terraform/worker1.bu
@@ -141,6 +141,7 @@ storage:
             criSocket: unix:///run/containerd/containerd.sock
             kubeletExtraArgs:
               node-ip: "fd00:0:0:2::101"
+              cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
               volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
           discovery:
             bootstrapToken:
diff --git a/terraform/worker2.bu b/terraform/worker2.bu
index 3168fe3..e90aec4 100644
--- a/terraform/worker2.bu
+++ b/terraform/worker2.bu
@@ -141,6 +141,7 @@ storage:
             criSocket: unix:///run/containerd/containerd.sock
             kubeletExtraArgs:
               node-ip: "fd00:0:0:2::102"
+              cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
               volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
           discovery:
             bootstrapToken:
diff --git a/terraform/worker3.bu b/terraform/worker3.bu
index 50caa24..78c9d78 100644
--- a/terraform/worker3.bu
+++ b/terraform/worker3.bu
@@ -141,6 +141,7 @@ storage:
             criSocket: unix:///run/containerd/containerd.sock
             kubeletExtraArgs:
               node-ip: "fd00:0:0:2::103"
+              cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
               volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
           discovery:
             bootstrapToken: