diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
index ed3cd6cde..ffbb02f27 100644
--- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
+++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
@@ -34,6 +34,9 @@ images:
   capd:
     manager: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f
     auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy: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
   capi:
     manager: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
     auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
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 61cb5e7cb..45b19cd22 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: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
+        image: ${CONTAINER_CAPO_AUTH_PROXY}
         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 3c8063a30..ec45c40bf 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: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1
+      - image: ${CONTAINER_CAPO_MANAGER}
         name: manager
diff --git a/manifests/function/clusterctl/clusterctl.yaml b/manifests/function/clusterctl/clusterctl.yaml
index fde2f6602..943798bf0 100644
--- a/manifests/function/clusterctl/clusterctl.yaml
+++ b/manifests/function/clusterctl/clusterctl.yaml
@@ -40,8 +40,10 @@ additional-vars:
   CONTAINER_CABPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7
   CONTAINER_CAPI_MANAGER:  us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
   CONTAINER_CAPD_MANAGER: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f
+  CONTAINER_CAPO_MANAGER: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1
   CONTAINER_CAPM3_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
   CONTAINER_CACPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
   CONTAINER_CABPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
   CONTAINER_CAPI_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
   CONTAINER_CAPD_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
+  CONTAINER_CAPO_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
diff --git a/manifests/function/clusterctl/replacements/versions.yaml b/manifests/function/clusterctl/replacements/versions.yaml
index 4dd329cff..e5679d7f3 100644
--- a/manifests/function/clusterctl/replacements/versions.yaml
+++ b/manifests/function/clusterctl/replacements/versions.yaml
@@ -92,6 +92,27 @@ replacements:
       kind: Clusterctl
       name: clusterctl_init
     fieldrefs: ["{.additional-vars.CONTAINER_CAPD_AUTH_PROXY}"]
+# Replace capo versions
+- source:
+    objref:
+      kind: VariableCatalogue
+      name: versions-airshipctl
+    fieldref: "{.images.capo.manager}"
+  target:
+    objref:
+      kind: Clusterctl
+      name: clusterctl_init
+    fieldrefs: ["{.additional-vars.CONTAINER_CAPO_MANAGER}"]
+- source:
+    objref:
+      kind: VariableCatalogue
+      name: versions-airshipctl
+    fieldref: "{.images.capo.auth_proxy}"
+  target:
+    objref:
+      kind: Clusterctl
+      name: clusterctl_init
+    fieldrefs: ["{.additional-vars.CONTAINER_CAPO_AUTH_PROXY}"]
 # Replace capi versions
 - source:
     objref: