diff --git a/pillar/top.sls b/pillar/top.sls
index 064d2cff3..b9117b19c 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,20 +1,17 @@
 base:
   'G@role:so-sensor':
-    - sensors.schedule
     - sensors.{{ grains.host }}
     - static
     - firewall.*
     - brologs
 
   'G@role:so-master':
-    - masters.schedule
     - masters.{{ grains.host }}
     - static
     - firewall.*
     - data.*
 
   'G@role:so-eval':
-    - masters.schedule
     - masters.{{ grains.host }}
     - static
     - firewall.*
@@ -22,7 +19,6 @@ base:
     - brologs
 
   'G@role:so-node':
-    - nodes.schedule
     - nodes.{{ grains.host }}
     - static
     - firewall.*
diff --git a/salt/schedule.sls b/salt/schedule.sls
new file mode 100644
index 000000000..8377117e9
--- /dev/null
+++ b/salt/schedule.sls
@@ -0,0 +1,5 @@
+schedule:
+  highstate:
+    funtion: state.highstate
+    minutes: 15
+    maxrunning: 1
diff --git a/salt/top.sls b/salt/top.sls
index 571558a75..29f73da7a 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -10,6 +10,7 @@ base:
     - bro
     {%- endif %}
     - filebeat
+    - schedule
 
   'G@role:so-eval':
     - ca
@@ -26,6 +27,7 @@ base:
     - suricata
     - bro
     - utility
+    - schedule
 
 
   'G@role:so-master':
@@ -40,6 +42,7 @@ base:
     - logstash
     - kibana
     - utility
+    - schedule
 
   # Storage node logic
 
@@ -48,6 +51,7 @@ base:
     - common
     - firewall
     - logstash
+    - schedule
 
   'G@role:so-node and I@node:node_type:hot':
     - match: pillar
@@ -55,12 +59,14 @@ base:
     - firewall
     - logstash
     - elasticsearch
+    - schedule
 
   'G@role:so-node and I@node:node_type:warm':
     - match: pillar
     - common
     - firewall
     - elasticsearch
+    - schedule
 
   'G@role:so-node and I@node:node_type:storage':
     - match: compound
@@ -68,9 +74,11 @@ base:
     - firewall
     - logstash
     - elasticsearch
+    - schedule
 
   'G@role:mastersensor':
     - common
     - firewall
     - sensor
     - master
+    - schedule