diff --git a/prometheus/config/file/install.sls b/prometheus/config/file/install.sls
index 6bd6b026..7878afdf 100644
--- a/prometheus/config/file/install.sls
+++ b/prometheus/config/file/install.sls
@@ -16,8 +16,8 @@ include:
 prometheus-config-file-etc-file-directory:
   file.directory:
     - name: {{ prometheus.dir.etc }}
-    - user: prometheus
-    - group: prometheus
+    - user: root
+    - group: {{ prometheus.rootgroup }}
     - mode: 755
     - makedirs: True
     - require:
diff --git a/prometheus/service/running.sls b/prometheus/service/running.sls
index 4c4351b1..3c5733a0 100644
--- a/prometheus/service/running.sls
+++ b/prometheus/service/running.sls
@@ -11,6 +11,7 @@ include:
   - {{ sls_config_args }}
   - {{ sls_config_file }}
 
+    {%- if 'prometheus' in prometheus.wanted %}
 prometheus-config-file-var-file-directory:
   file.directory:
     - name: {{ prometheus.dir.var }}
@@ -20,6 +21,7 @@ prometheus-config-file-var-file-directory:
     - makedirs: True
     - require:
       - file: prometheus-config-file-etc-file-directory
+    {%- endif %}
 
     {%- for name in prometheus.wanted %}
         {%- if name in prometheus.service %}
@@ -34,8 +36,10 @@ prometheus-config-file-var-file-directory:
 prometheus-service-running-{{ name }}-service-unmasked:
   service.unmasked:
     - name: {{ service_name }}
+                {%- if 'prometheus' in prometheus.wanted %}
     - require:
       - file: prometheus-config-file-var-file-directory
+                {%- endif %}
     - onlyif:
        -  systemctl list-units | grep {{ service_name }} >/dev/null 2>&1
             {%- endif %}
@@ -48,8 +52,10 @@ prometheus-service-running-{{ name }}-service-running:
     - watch:
       - file: prometheus-config-file-{{ name }}-file-managed
             {%- endif %}
+            {%- if 'prometheus' in prometheus.wanted %}
     - require:
       - file: prometheus-config-file-var-file-directory
+            {%- endif %}
             {%- if grains.kernel|lower == 'linux' %}
       - service: prometheus-service-running-{{ name }}-service-unmasked
     - onlyif: systemctl list-units | grep {{ service_name }} >/dev/null 2>&1