diff --git a/rabbitmq/meta/salt.yml b/rabbitmq/meta/salt.yml
new file mode 100644
index 0000000..4a661a9
--- /dev/null
+++ b/rabbitmq/meta/salt.yml
@@ -0,0 +1,6 @@
+orchestrate:
+  server:
+    priority: 130
+  cluster:
+    priority: 130
+
diff --git a/rabbitmq/orchestrate/cluster.sls b/rabbitmq/orchestrate/cluster.sls
index 9659383..34fbbf2 100644
--- a/rabbitmq/orchestrate/cluster.sls
+++ b/rabbitmq/orchestrate/cluster.sls
@@ -1,14 +1,17 @@
-salt_rabbitmq_cluster_master:
+rabbitmq.cluster.master:
   salt.state:
-    - tgt: 'G@roles:rabbitmq.cluster and I@rabbitmq:cluster:role:master'
-    - tgt_type: compound
+    - tgt: 'rabbitmq:cluster:role:master'
+    - tgt_type: pillar
+    - queue: True
     - sls: rabbitmq
 
-salt_rabbitmq_cluster_slave:
+rabbitmq.cluster.slave:
   salt.state:
-    - tgt: 'G@roles:rabbitmq.cluster and I@rabbitmq:cluster:role:slave'
-    - tgt_type: compound
+    - tgt: 'rabbitmq:cluster:role:slave'
+    - tgt_type: pillar
+    - queue: True
     - sls: rabbitmq
+    - batch: 1
     - require:
-      - salt: salt_rabbitmq_cluster_master
+      - salt: rabbitmq.cluster.master
 
diff --git a/rabbitmq/orchestrate/server.sls b/rabbitmq/orchestrate/server.sls
index e454490..67c888a 100644
--- a/rabbitmq/orchestrate/server.sls
+++ b/rabbitmq/orchestrate/server.sls
@@ -1,6 +1,6 @@
-rabbitmq_state:
+rabbitmq.server:
   salt.state:
-    - tgt: 'G@roles:rabbitmq.server and not G@roles:rabbitmq.cluster'
+    - tgt: 'I@rabbitmq:server and not I@rabbitmq:cluster'
     - tgt_type: compound
     - sls: rabbitmq