diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml
index bdb9a20..b50b0df 100644
--- a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml
+++ b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml
@@ -57,7 +57,6 @@ scrape_configs:
   scheme: http
   static_configs:
   - targets:
-    - jitsi.hamburg.ccc.de:9100 # Node Exporter
     - jitsi.hamburg.ccc.de:9888 # Jitsi Video Bridge
 - job_name: chaosknoten
   honor_timestamps: true
@@ -101,3 +100,4 @@ scrape_configs:
         - mjolnir-intern.hamburg.ccc.de:9100
         - woodpecker-intern.hamburg.ccc.de:9100
         - penpot-intern.hamburg.ccc.de:9100
+        - jitsi.hamburg.ccc.de:9100
diff --git a/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2
index 212a9f9..3e994dc 100644
--- a/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2
+++ b/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2
@@ -25,6 +25,7 @@ services:
     volumes:
       - ./configs/alertmanager.yaml:/etc/alertmanager/alertmanager.yaml
       - ./configs/alertmanager_alert_templates.tmpl:/etc/alertmanager/templates/alert_templates.tmpl
+      - alertmanager_data:/alertmanager
 
   grafana:
     image: grafana/grafana
@@ -57,3 +58,4 @@ services:
 volumes:
   graf_data: {}
   prom_data: {}
+  alertmanager_data: {}