diff --git a/manifests/function/ironic-deployment/v0.5.0/kustomization.yaml b/manifests/function/ironic-deployment/v0.5.0/kustomization.yaml
index aca64d950..68cc90ac9 100644
--- a/manifests/function/ironic-deployment/v0.5.0/kustomization.yaml
+++ b/manifests/function/ironic-deployment/v0.5.0/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: metal3
 resources:
-- upstream/default
+- upstream/keepalived
 - config-file
 - entrypoint
 - ironic-pv.yaml
diff --git a/manifests/function/ironic-deployment/v0.5.0/upstream/keepalived/ironic_bmo_configmap.env b/manifests/function/ironic-deployment/v0.5.0/upstream/keepalived/ironic_bmo_configmap.env
index ac4734e89..06236dac9 100644
--- a/manifests/function/ironic-deployment/v0.5.0/upstream/keepalived/ironic_bmo_configmap.env
+++ b/manifests/function/ironic-deployment/v0.5.0/upstream/keepalived/ironic_bmo_configmap.env
@@ -5,14 +5,17 @@ https_proxy=""
 NO_PROXY=""
 no_proxy=""
 
-PROVISIONING_INTERFACE=ironicendpoint
+PROVISIONING_INTERFACE=eth2
 PROVISIONING_IP=172.22.0.2
+PROVISIONING_CIDR=""
+DHCP_RANGE=172.22.0.10,172.22.0.100
 HTTP_PORT=6180
-DEPLOY_KERNEL_URL=http://PROVISIONING_IP:HTTP_PORT/images/ironic-python-agent.kernel
-DEPLOY_RAMDISK_URL=http://PROVISIONING_IP:HTTP_PORT/images/ironic-python-agent.initramfs
+DEPLOY_KERNEL_URL=http://PROVISIONING_IP:HTTP_PORT/images/ipa-ubuntu-master.kernel
+DEPLOY_RAMDISK_URL=http://PROVISIONING_IP:HTTP_PORT/images/ipa-ubuntu-master.initramfs
 IRONIC_ENDPOINT=http://PROVISIONING_IP:6385/v1/
 IRONIC_INSPECTOR_ENDPOINT=http://PROVISIONING_IP:5050/v1/
 # CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0
+IRONIC_INSPECTOR_VLAN_INTERFACES=all
 RESTART_CONTAINER_CERTIFICATE_UPDATED=false
diff --git a/manifests/site/test-site/ephemeral/catalogues/shareable/networking.yaml b/manifests/site/test-site/ephemeral/catalogues/shareable/networking.yaml
index d7d9e5efe..4f8b254dc 100644
--- a/manifests/site/test-site/ephemeral/catalogues/shareable/networking.yaml
+++ b/manifests/site/test-site/ephemeral/catalogues/shareable/networking.yaml
@@ -15,6 +15,6 @@ spec:
     apiserverCertSANs: "[10.23.25.101, 10.23.24.101]"
 
   ironic:
-    provisioningIp: "10.23.24.101"
+    provisioningIp: "10.23.24.137"
     dhcpRange: "10.23.24.200,10.23.24.250"
     ironicAutomatedClean: true
diff --git a/manifests/site/test-site/target/catalogues/shareable/networking.yaml b/manifests/site/test-site/target/catalogues/shareable/networking.yaml
index 5129832e7..9995afd6a 100644
--- a/manifests/site/test-site/target/catalogues/shareable/networking.yaml
+++ b/manifests/site/test-site/target/catalogues/shareable/networking.yaml
@@ -14,6 +14,6 @@ spec:
     apiserverCertSANs: "[10.23.25.102, 10.23.24.102]"
 
   ironic:
-    provisioningIp: "10.23.24.102"
+    provisioningIp: "10.23.24.137"
     dhcpRange: "10.23.24.200,10.23.24.250"
     ironicAutomatedClean: true
diff --git a/manifests/site/test-site/target/catalogues/shareable/versions-airshipctl.yaml b/manifests/site/test-site/target/catalogues/shareable/versions-airshipctl.yaml
index c789395aa..2a85137c8 100644
--- a/manifests/site/test-site/target/catalogues/shareable/versions-airshipctl.yaml
+++ b/manifests/site/test-site/target/catalogues/shareable/versions-airshipctl.yaml
@@ -8,5 +8,5 @@ spec:
     k8scontrol:
       # Host the image in a locally served location for CI
       cluster_controlplane_image:
-        url: http://10.23.24.101:80/images/control-plane.qcow2
-        checksum: http://10.23.24.101:80/images/control-plane.qcow2.md5sum
+        url: http://10.23.24.137:80/images/control-plane.qcow2
+        checksum: http://10.23.24.137:80/images/control-plane.qcow2.md5sum