diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
index a3bc1497a..a98678a08 100644
--- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
+++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
@@ -51,8 +51,12 @@ images:
       repository: gcr.io/kubebuilder
       tag: v0.4.0
   capo:
-    manager: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1
-    auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
+    manager:
+      repository: gcr.io/k8s-staging-capi-openstack
+      tag: v20200707-v0.3.1
+    auth_proxy:
+      repository: gcr.io/kubebuilder
+      tag: v0.4.1
   capg:
     manager:
       repository: gcr.io/k8s-staging-cluster-api-gcp
diff --git a/manifests/function/capo/v0.3.1/manager/manager_auth_proxy_patch.yaml b/manifests/function/capo/v0.3.1/manager/manager_auth_proxy_patch.yaml
index 45b19cd22..61cb5e7cb 100644
--- a/manifests/function/capo/v0.3.1/manager/manager_auth_proxy_patch.yaml
+++ b/manifests/function/capo/v0.3.1/manager/manager_auth_proxy_patch.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: ${CONTAINER_CAPO_AUTH_PROXY}
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"
diff --git a/manifests/function/capo/v0.3.1/manager/manager_image_patch.yaml b/manifests/function/capo/v0.3.1/manager/manager_image_patch.yaml
index ec45c40bf..473c22d67 100644
--- a/manifests/function/capo/v0.3.1/manager/manager_image_patch.yaml
+++ b/manifests/function/capo/v0.3.1/manager/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: ${CONTAINER_CAPO_MANAGER}
+      - image: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:dev
         name: manager
diff --git a/manifests/function/clusterctl/clusterctl.yaml b/manifests/function/clusterctl/clusterctl.yaml
index 6ae02e9e5..e4724e0f1 100644
--- a/manifests/function/clusterctl/clusterctl.yaml
+++ b/manifests/function/clusterctl/clusterctl.yaml
@@ -81,9 +81,13 @@ images:
   infrastructure-gcp/kube-rbac-proxy:
     repository: "gcr.io/kubebuilder"
     tag: "v0.4.1"
+  infrastructure-openstack/capi-openstack-controller-amd64:
+    repository: "gcr.io/k8s-staging-capi-openstack"
+    tag: "v20200707-v0.3.1"
+  infrastructure-openstack/kube-rbac-proxy:
+    repository: "gcr.io/kubebuilder"
+    tag: "v0.4.1"
 
 
 # These default images can be overridden via the `replacements/` entrypoint
-additional-vars:
-  CONTAINER_CAPO_MANAGER: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1
-  CONTAINER_CAPO_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
+additional-vars: {}
diff --git a/manifests/function/clusterctl/replacements/versions.yaml b/manifests/function/clusterctl/replacements/versions.yaml
index cdb99968c..0a411d80f 100644
--- a/manifests/function/clusterctl/replacements/versions.yaml
+++ b/manifests/function/clusterctl/replacements/versions.yaml
@@ -102,7 +102,7 @@ replacements:
     objref:
       kind: Clusterctl
       name: clusterctl_init
-    fieldrefs: ["{.additional-vars.CONTAINER_CAPO_MANAGER}"]
+    fieldrefs: ["{.images.infrastructure-openstack/capi-openstack-controller-amd64}"]
 - source:
     objref:
       kind: VariableCatalogue
@@ -112,7 +112,7 @@ replacements:
     objref:
       kind: Clusterctl
       name: clusterctl_init
-    fieldrefs: ["{.additional-vars.CONTAINER_CAPO_AUTH_PROXY}"]
+    fieldrefs: ["{.images.infrastructure-openstack/kube-rbac-proxy}"]
 # Replace capg versions
 - source:
     objref: