diff --git a/stacks/monitor.yml b/stacks/monitor.yml
index 1d3b87d..a3e755f 100644
--- a/stacks/monitor.yml
+++ b/stacks/monitor.yml
@@ -64,6 +64,7 @@ services:
 
   node-exporter:
     image: 'prom/node-exporter:v1.3.1'
+    hostname: srv-{{.Node.Hostname}}
     command:
       - '--path.procfs=/host/proc'
       - '--path.rootfs=/rootfs'
@@ -79,8 +80,6 @@ services:
       - '/proc:/host/proc:ro'
       - '/sys:/host/sys:ro'
       - '/:/rootfs:ro'
-      # Hopefully causes node-exporter to show the correct hostname
-      - '/etc/hostname:/etc/hostname:ro'
 
 configs:
   prometheus_v6: