diff --git a/roles/defaults/vars/main.yml b/roles/defaults/vars/main.yml
index 8ba1403..bae7f04 100644
--- a/roles/defaults/vars/main.yml
+++ b/roles/defaults/vars/main.yml
@@ -36,10 +36,10 @@
   cinder_storage_init: "registry.atmosphere.dev/library/cinder:{{ atmosphere_release }}"
   cinder_volume_usage_audit: "registry.atmosphere.dev/library/cinder:{{ atmosphere_release }}"
   cinder_volume: "registry.atmosphere.dev/library/cinder:{{ atmosphere_release }}"
-  cluster_api_controller: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0
-  cluster_api_kubeadm_bootstrap_controller: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0
-  cluster_api_kubeadm_control_plane_controller: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0
-  cluster_api_openstack_controller: registry.k8s.io/capi-openstack/capi-openstack-controller:v0.9.0
+  cluster_api_controller: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
+  cluster_api_kubeadm_bootstrap_controller: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
+  cluster_api_kubeadm_control_plane_controller: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
+  cluster_api_openstack_controller: registry.k8s.io/capi-openstack/capi-openstack-controller:v0.11.2
   csi_node_driver_registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
   csi_rbd_attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
   csi_rbd_plugin: quay.io/cephcsi/cephcsi:v3.11.0
diff --git a/roles/magnum/meta/main.yml b/roles/magnum/meta/main.yml
index a992fbc..3a45f47 100644
--- a/roles/magnum/meta/main.yml
+++ b/roles/magnum/meta/main.yml
@@ -38,6 +38,10 @@
       upload_helm_chart_dest: "{{ magnum_helm_chart_ref }}"
   - role: vexxhost.kubernetes.cluster_api
     vars:
+      clusterctl_version: 1.8.4
       clusterctl_config: "{{ magnum_clusterctl_config }}"
+      cluster_api_version: 1.8.4
+      cluster_api_infrastructure_provider: openstack
+      cluster_api_infrastructure_version: 0.11.2
       cluster_api_node_selector:
         openstack-control-plane: enabled