diff --git a/roles/ci_dcn_site/tasks/az.yml b/roles/ci_dcn_site/tasks/az.yml
index 0909f1dcc..cf5e067c0 100644
--- a/roles/ci_dcn_site/tasks/az.yml
+++ b/roles/ci_dcn_site/tasks/az.yml
@@ -34,6 +34,7 @@
 - name: Create AZ if it does not exist
   when:
     - az_hosts.rc == 1
+  ignore_errors: true
   kubernetes.core.k8s_exec:
     api_key: "{{ _auth_results.openshift_auth.api_key }}"
     namespace: "{{ cifmw_openstack_namespace }}"
@@ -41,6 +42,20 @@
     command: >-
       openstack aggregate create {{ _az }} --zone {{ _az }}
 
+- name: Verify AZ aggregate exists
+  when:
+    - az_hosts.rc == 1
+  register: az_verify
+  retries: 10
+  delay: 30
+  until: az_verify.rc == 0
+  kubernetes.core.k8s_exec:
+    api_key: "{{ _auth_results.openshift_auth.api_key }}"
+    namespace: "{{ cifmw_openstack_namespace }}"
+    pod: openstackclient
+    command: >-
+      openstack aggregate show {{ _az }} -c name -f value
+
 - name: Add only the missing edpm hosts to AZ
   ignore_errors: true
   register: ignore_errors_register