diff --git a/base/packages/prometheus.sls b/base/packages/prometheus.sls
index b67a952..f947ad3 100644
--- a/base/packages/prometheus.sls
+++ b/base/packages/prometheus.sls
@@ -1,16 +1,16 @@
+{%
+set has_promexporter = salt['pillar.get'](
+  'chaos-role',
+  default={}
+  )
+%}
+
+{%- if 'prometheus-node_exporter' in has_promexporter %}
 
 include:
   - prometheus
   - systemd.reload
 
-{%
-set has_promexporter = salt['pillar.get'](
-  'prometheus:wanted',
-  default={}
-  )
-%}
-
-{%- if 'node_exporter' in has_promexporter %}
 systemd-prometheus-node-exporter-service-override:
   file.managed:
     - name: /etc/systemd/system/prometheus-node-exporter.service.d/override.conf
@@ -20,8 +20,11 @@ systemd-prometheus-node-exporter-service-override:
     - contents: |
         [Service]
         ExecStartPre=mkdir -p {{ salt['pillar.get']('prometheus:service:node_exporter:args:collector.textfile.directory') }}
-        ExecStartPre=chown node_exporter:node_exporter {{ salt['pillar.get']('prometheus:service:node_exporter:args:collector.textfile.directory') }}
+        ExecStartPre=chown prometheus:prometheus {{ salt['pillar.get']('prometheus:service:node_exporter:args:collector.textfile.directory') }}
         ExecStartPre=chmod 755 {{ salt['pillar.get']('prometheus:service:node_exporter:args:collector.textfile.directory') }}
     - watch_in:
       - cmd: reload_systemd_configuration
+{%- else %}
+include:
+  - prometheus.clean
 {%- endif %}