diff --git a/coreos-config/roles/compose_project/templates/prometheus/docker-compose.yaml b/coreos-config/roles/compose_project/templates/prometheus/docker-compose.yaml
index 06ad71f..20534e2 100644
--- a/coreos-config/roles/compose_project/templates/prometheus/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/prometheus/docker-compose.yaml
@@ -97,10 +97,12 @@ services:
       - "GF_SECURITY_ADMIN_USER={{ grafana.admin.user }}"
       - "GF_SECURITY_ADMIN_PASSWORD={{ grafana.admin.password }}"
     volumes:
+      - grafana_data:/grafana
       - ./grafana-ds.yml:/etc/grafana/provisioning/datasources/datasource.yml:ro,Z
 
   node-exporter:
     image: quay.io/prometheus/node-exporter:latest
+    container_name: host-nc-chaoswg-org-node-exporter
     privileged: true
     labels:
       - "prometheus-scrape.enabled=true"
@@ -110,12 +112,14 @@ services:
       - /sys:/host/sys:ro
       - /:/rootfs:ro
       - /:/host:ro,rslave
+      - /run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket:ro
     command:
       - '--path.rootfs=/host'
       - '--path.procfs=/host/proc'
       - '--path.sysfs=/host/sys'
       - '--collector.filesystem.ignored-mount-points'
       - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
+      - '--collector.systemd'
     networks:
       - backend
     restart: unless-stopped
@@ -138,6 +142,7 @@ services:
 
 volumes:
   prom_data:
+  grafana_data:
   label_discovery:
   alertmanager_data:
 networks: