diff --git a/roles/cifmw_setup/tasks/infra.yml b/roles/cifmw_setup/tasks/infra.yml
index 49e911362..24269cbb7 100644
--- a/roles/cifmw_setup/tasks/infra.yml
+++ b/roles/cifmw_setup/tasks/infra.yml
@@ -46,6 +46,15 @@
   ansible.builtin.import_role:
     name: openshift_setup
 
+- name: Wait for cluster to stabilize after openshift_setup changes
+  environment:
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+    PATH: "{{ cifmw_path }}"
+  ansible.builtin.command:
+    cmd: >-
+      oc adm wait-for-stable-cluster --minimum-stable-period=5s --timeout=30m
+  changed_when: false
+
 - name: Deploy Observability operator.
   when:
     - cifmw_deploy_obs is defined