diff --git a/prometheus/prometheus.sls b/prometheus/prometheus.sls
index aabc8ab..cd523d6 100644
--- a/prometheus/prometheus.sls
+++ b/prometheus/prometheus.sls
@@ -40,10 +40,21 @@ prometheus:
           static_configs:
             - targets:
               - drucki.chaos:9101
+              - riot01.chaos:9101
         - job_name: klipper
           static_configs:
             - targets:
               - drucki.chaos:3903
+        - job_name: octoprint
+          metrics_path: '/plugin/prometheus_exporter/metrics'
+          static_configs:
+            - targets:
+              - drucki.chaos:80
+        - job_name: openhab2
+          metrics_path: '/'
+          static_configs:
+            - targets:
+              - auto.chaos:9999
         - job_name: 'node'
           static_configs:
             - targets:
diff --git a/top.sls b/top.sls
index bdb7157..7d0fd3a 100644
--- a/top.sls
+++ b/top.sls
@@ -6,10 +6,11 @@ base:
   '*':
     - saltmine
     - prometheus.node_exporter
-  'pine03*':
-    - prometheus.prometheus
   'riot01*':
     - haproxy
+    - prometheus.prometheus
+  #'pine03*':
+  #  - prometheus.prometheus
   #'ebin*':
   #  - ceph
   #'pine0[12]*':