diff --git a/rabbitmq/cluster.sls b/rabbitmq/cluster.sls
index b5aaa1b..2d55684 100644
--- a/rabbitmq/cluster.sls
+++ b/rabbitmq/cluster.sls
@@ -5,7 +5,7 @@
 - linux.network.host
 - rabbitmq.server.service
 
-{% if cluster.get('role', 'slave') == 'master' %}
+{% if cluster.get('role', 'None') == 'master' %}
 
 rabbitmq_cluster_name:
   cmd.run:
@@ -16,7 +16,7 @@
   - require:
     - service: rabbitmq_service
 
-{% else %}
+{% elif cluster.get('role', 'None') == 'slave' %}
 
 rabbit@master:
   rabbitmq_cluster.join:
@@ -28,6 +28,10 @@
   - require:
     - service: rabbitmq_service
 
+{%- else %}
+
+{# Container deployment role independent #}
+
 {%- endif %}
 
 {%- endif %}