diff --git a/role-rocky-rabbitmq.yml b/role-rocky-rabbitmq.yml
index 0d1d8c7..1d340f2 100644
--- a/role-rocky-rabbitmq.yml
+++ b/role-rocky-rabbitmq.yml
@@ -1,14 +1,14 @@
 ---
 # Stands up a RabbitMQ Cluster
 - name: Configure RabbitMQ
-  hosts: rabbitmq_rlp
+  hosts: rabbitmq_{{ rabbitmq_cluster_tag }}
   become: true
   vars_files:
     # vars/vaults/encpass.yml
     - vars/common.yml
-    - vars/rabbitmq/rlp/rabbitmq.yml
-    - vars/rabbitmq/rlp/rabbitmq_vhost.yml
-    - vars/rabbitmq/rlp/rabbitmq_users.yml
+    - "vars/rabbitmq/{{ rabbitmq_cluster_tag }}/rabbitmq.yml"
+    - "vars/rabbitmq/{{ rabbitmq_cluster_tag }}rlp/rabbitmq_vhost.yml"
+    - "vars/rabbitmq/{{ rabbitmq_cluster_tag }}rlp/rabbitmq_users.yml"
 
   # This is to try to avoid the handler issue in pre/post tasks
   handlers: