diff --git a/base/init.sls b/base/init.sls
index a20a227..1faa0c1 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -7,7 +7,6 @@ include:
   - .pki
   - .gluster.client
   - sysctl
-  - prometheus
   - rsyslog
   - sudoers
   - systemd
diff --git a/base/packages/init.sls b/base/packages/init.sls
index 7be2210..03d5ea1 100644
--- a/base/packages/init.sls
+++ b/base/packages/init.sls
@@ -5,3 +5,4 @@
 include:
   - .common
   - .repo.maketank
+  - .prometheus
diff --git a/base/packages/prometheus.sls b/base/packages/prometheus.sls
new file mode 100644
index 0000000..5c013dd
--- /dev/null
+++ b/base/packages/prometheus.sls
@@ -0,0 +1,26 @@
+
+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
+    - user: root
+    - group: root
+    - makedirs: True
+    - contents: |
+        [Service]
+        ExecStartPre=mkdir -p {{ salt['pillar.get']('prometheus:service:node_exporter:args:collector.textfile.directory') }}
+        ExecStartPre=chmod 777 {{ salt['pillar.get']('prometheus:service:node_exporter:args:collector.textfile.directory') }}
+    - watch_in:
+      - cmd: reload_systemd_configuration
+{%- endif %}
diff --git a/top.sls b/top.sls
index 2caae1d..382bc40 100644
--- a/top.sls
+++ b/top.sls
@@ -17,8 +17,6 @@ base:
     - grafana
   'auto*':
     - base.packages.openhab2
-  'pine03':
-    - base.packages.openhab2
   'pine*':
     - k8s
   'kube*':
@@ -26,12 +24,3 @@ base:
   'lenny*':
     - k8s.admin
     - base.packages.node.lenny
-  #'ebin*':
-  #  - ceph
-  #  - ceph.osd
-  #'pine0[12]*':
-  #  - ceph
-  #  - ceph.mon
-  #'riot*':
-  #  - ceph
-  #  - ceph.mon