diff --git a/pillar/top.sls b/pillar/top.sls
index 65d10a7d0..248301f91 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,7 +1,7 @@
 base:
   'G@role:so-sensor'
     - sensor.schedule
-    - sensors.{{ hostname }}
+    - sensors.{{ grains.host }}
   'G@role:so-master'
     - master.schedule
-    - masters.{{ hostname }}
+    - masters.{{ grains.host }}