diff --git a/docs_user/modules/proc_adopting-the-identity-service.adoc b/docs_user/modules/proc_adopting-the-identity-service.adoc
index b305f4128..8af680c42 100644
--- a/docs_user/modules/proc_adopting-the-identity-service.adoc
+++ b/docs_user/modules/proc_adopting-the-identity-service.adoc
@@ -79,3 +79,9 @@ done
 ----
 $ openstack endpoint list | grep keystone
 ----
+
+. Wait for the `OpenStackControlPlane` resource to become `Ready`:
++
+----
+$ oc wait --for=condition=Ready --timeout=1m OpenStackControlPlane openstack
+----
diff --git a/docs_user/modules/proc_deploying-backend-services.adoc b/docs_user/modules/proc_deploying-backend-services.adoc
index de56bf577..39756e360 100644
--- a/docs_user/modules/proc_deploying-backend-services.adoc
+++ b/docs_user/modules/proc_deploying-backend-services.adoc
@@ -26,7 +26,7 @@ endif::[]
 
 * If you enabled TLS everywhere (TLS-e) on the {OpenStackShort} environment, you must copy the `tls` root CA from the {OpenStackShort} environment to the `rootca-internal` issuer.
 
-* There are free PVs available for MariaDB and RabbitMQ.
+* There are free PVs available for Galera and RabbitMQ.
 ifeval::["{build}" != "downstream"]
 +
 For developer/CI environments driven by install_yamls, make sure
@@ -415,18 +415,26 @@ spec:
 
 .Verification
 
-* Verify that MariaDB and RabbitMQ are running for all defined cells:
+* Verify that the Galera and RabbitMQ status is `Running` for all defined cells:
 +
+[source,yaml]
 ----
 $ RENAMED_CELLS="cell1 cell2 cell3"
-$ oc get pod openstack-galera-0 -o jsonpath='{.status.phase}{"\n"}' | grep Running
-$ oc get pod rabbitmq-server-0 -o jsonpath='{.status.phase}{"\n"}' | grep Running
+$ oc get pod openstack-galera-0 -o jsonpath='{.status.phase}{"\n"}'
+$ oc get pod rabbitmq-server-0 -o jsonpath='{.status.phase}{"\n"}'
 $ for CELL in $(echo $RENAMED_CELLS); do
-    oc get pod openstack-$CELL-galera-0 -o jsonpath='{.status.phase}{"\n"}' | grep Running
-    oc get pod rabbitmq-$CELL-server-0 -o jsonpath='{.status.phase}{"\n"}' | grep Running
-done
+>     oc get pod openstack-$CELL-galera-0 -o jsonpath='{.status.phase}{"\n"}'
+>     oc get pod rabbitmq-$CELL-server-0 -o jsonpath='{.status.phase}{"\n"}'
+> done
 ----
 +
 The given cells names are later referred to by using the environment variable `RENAMED_CELLS`.
 
-* Verify that you can access the `OpenStackClient` pod. For more information, see link:{defaultURL}/maintaining_the_red_hat_openstack_services_on_openshift_deployment/assembly_accessing-the-rhoso-cloud#proc_accessing-the-OpenStackClient-pod_cloud-access-admin[Accessing the OpenStackClient pod] in _Maintaining the {rhos_long_noacro} deployment_.
+* Verify that the `OpenStackControlPlane` CR is waiting for deployment
+  of the `openstackclient` pod:
++
+----
+$ oc get OpenStackControlPlane openstack
+NAME        STATUS    MESSAGE
+openstack   Unknown   OpenStackControlPlane Client not started
+----
diff --git a/tests/roles/backend_services/tasks/main.yaml b/tests/roles/backend_services/tasks/main.yaml
index d1010f602..d6c12e684 100644
--- a/tests/roles/backend_services/tasks/main.yaml
+++ b/tests/roles/backend_services/tasks/main.yaml
@@ -151,3 +151,14 @@
       -p='[{"op": "replace", "path": "/spec/rabbitmq/templates/rabbitmq-cell1/resources/requests/cpu", "value": 500m}]'
     oc patch ${crname} --type json \
       -p='[{"op": "replace", "path": "/spec/rabbitmq/templates/rabbitmq-cell1/resources/requests/memory", "value": 500Mi}]'
+
+- name: Verify that OpenStackControlPlane is waiting for openstackclient
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+
+    oc get openstackcontrolplane openstack -o jsonpath='{.status.conditions[?(@.type=="Ready")].message}{"\n"}' | grep 'OpenStackControlPlane Client not started'
+  register: openstack_control_plane_cr_result
+  until: openstack_control_plane_cr_result is success
+  retries: 60
+  delay: 2
diff --git a/tests/roles/keystone_adoption/tasks/main.yaml b/tests/roles/keystone_adoption/tasks/main.yaml
index 9d0b81cb5..665701968 100644
--- a/tests/roles/keystone_adoption/tasks/main.yaml
+++ b/tests/roles/keystone_adoption/tasks/main.yaml
@@ -56,6 +56,12 @@
   retries: 60
   delay: 2
 
+- name: verify that OpenStackControlPlane setup is complete
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc wait --for=condition=Ready --timeout=1m OpenStackControlPlane openstack
+
 - name: clean up services and endpoints
   ansible.builtin.shell: |
     {{ shell_header }}