diff --git a/roles/rabbitmq/meta/main.yml b/roles/rabbitmq/meta/main.yml
index da0f4ee..dbe22a6 100644
--- a/roles/rabbitmq/meta/main.yml
+++ b/roles/rabbitmq/meta/main.yml
@@ -23,4 +23,4 @@
         - focal
 
 dependencies:
-  - rabbitmq_operator
+  - role: rabbitmq_operator
diff --git a/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml
index 1ff2f81..8e51bfe 100644
--- a/roles/rabbitmq/tasks/main.yml
+++ b/roles/rabbitmq/tasks/main.yml
@@ -43,3 +43,10 @@
     wait_condition:
       type: ClusterAvailable
       status: "True"
+  # NOTE(mnaser): Since we haven't moved to the operator pattern yet, we need to
+  #               keep retrying a few times as the CRDs might not be installed
+  #               yet.
+  retries: 60
+  delay: 5
+  register: _result
+  until: _result is not failed