diff --git a/role-rocky-rabbitmq.yml b/role-rocky-rabbitmq.yml
index 1d340f2..91a1638 100644
--- a/role-rocky-rabbitmq.yml
+++ b/role-rocky-rabbitmq.yml
@@ -1,7 +1,7 @@
 ---
 # Stands up a RabbitMQ Cluster
 - name: Configure RabbitMQ
-  hosts: rabbitmq_{{ rabbitmq_cluster_tag }}
+  hosts: rabbitmq_{{ rabbitmq_env }}
   become: true
   vars_files:
     # vars/vaults/encpass.yml
@@ -35,6 +35,13 @@
         success_msg: "We are on a supported system"
         fail_msg: "Only Rocky Linux versions 9 or higher are supported."
 
+    - name: Verify that rabbitmq cluster name is defined
+      ansible.builtin.assert:
+        that:
+          - rabbitmq_cluster_name|mandatory
+        success_msg: "Cluster name is {{ rabbitmq_cluster_name }}"
+        fail_msg: "Cluster name is not defined"
+
     # We have separate passwords per rabbitmq env
     - name: Import rabbitmq passwords
       ansible.builtin.include_vars: