diff --git a/swarm/monitoring.yaml b/swarm/monitoring.yaml
index 3493954..00e4a53 100644
--- a/swarm/monitoring.yaml
+++ b/swarm/monitoring.yaml
@@ -164,9 +164,9 @@ services:
   # ============================================================
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:latest
+    hostname: "{{.Node.Hostname}}"
     environment:
       TZ: America/Chicago
-    hostname: "{{.Node.Hostname}}"
     command:
       - --docker_only=true
       - --store_container_labels=false
@@ -195,13 +195,17 @@ services:
   # ============================================================
   node-exporter:
     image: prom/node-exporter:latest
+    hostname: "{{.Node.Hostname}}"
     environment:
       TZ: America/Chicago
+      NODE_HOSTNAME: "{{.Node.Hostname}}"
     command:
       - --path.rootfs=/host
       - --collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)
+      - --collector.textfile.directory=/etc/node-exporter
     volumes:
       - /:/host:ro,rslave
+      - /etc/hostname:/etc/hostname:ro
     networks:
       - netgrimoire
     deploy: