diff --git a/rabbitmq/cluster.sls b/rabbitmq/cluster.sls
index c3ed416..ba781f9 100644
--- a/rabbitmq/cluster.sls
+++ b/rabbitmq/cluster.sls
@@ -5,24 +5,14 @@
 - linux.network.host
 - rabbitmq.server.service
 
-rabbitmq_dirs:
-  file.directory:
-  - names:
-    - /root/rabbitmq/flags
-  - mode: 700
-  - user: root
-  - group: root
-  - makedirs: true
-
 {% if cluster.get('role', 'slave') == 'master' %}
 
 rabbitmq_cluster_init:
   cmd.run:
   - names:
     - rabbitmqctl set_cluster_name {{ cluster.get('name', 'rabbitmq') }}
-  - unless: test -e /root/rabbitmq/flags/cluster-installed
+  - unless: test -e /var/lib/rabbitmq/.cluster-installed
   - require:
-    - file: rabbitmq_dirs
     - service: rabbitmq_service
 
 {% else %}
@@ -35,7 +25,6 @@
   - ram_node: true
   {%- endif %}
   - require:
-    - file: rabbitmq_dirs
     - service: rabbitmq_service
 
 {%- endif %}
@@ -43,10 +32,9 @@
 rabbitmq_cluster_init_final:
   cmd.run:
   - names:
-    - touch /root/rabbitmq/flags/cluster-installed
-  - unless: test -e /root/rabbitmq/flags/cluster-installed
+    - touch /var/lib/rabbitmq/.cluster-installed
+  - unless: test -e /var/lib/rabbitmq/.cluster-installed
   - require:
-    - file: rabbitmq_dirs
     - service: rabbitmq_service
 
 {%- endif %}