diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index a0e4925..5f6e1f5 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -360,10 +360,13 @@
     salt.enforceState(master, 'I@telegraf:agent or I@telegraf:remote_agent', 'telegraf', true)
 
     //Install Elasticsearch and Kibana
+    salt.enforceState(master, '*01* and  I@elasticsearch:server', 'elasticsearch.server', true)
     salt.enforceState(master, 'I@elasticsearch:server', 'elasticsearch.server', true)
+    salt.enforceState(master, '*01* and I@kibana:server', 'kibana.server', true)
     salt.enforceState(master, 'I@kibana:server', 'kibana.server', true)
     salt.enforceState(master, 'I@elasticsearch:client', 'elasticsearch.client', true)
     salt.enforceState(master, 'I@kibana:client', 'kibana.client', true)
+    salt.enforceState(master, '*01* and I@influxdb:server', 'influxdb', true)
     salt.enforceState(master, 'I@influxdb:server', 'influxdb', true)
 
     //Collect Grains