diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 11fc586..e56fdad 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -117,7 +117,7 @@
                 try {
                     saltMasterPort = SALT_MASTER_PORT
                 } catch (MissingPropertyException e) {
-                    saltMasterPort = 8000
+                    saltMasterPort = 6969
                 }
                 saltMasterHost = openstack.getHeatStackOutputParam(openstackCloud, HEAT_STACK_NAME, 'salt_master_ip', openstackEnv)
                 saltMasterUrl = "http://${saltMasterHost}:${saltMasterPort}"
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 6f0717d..21eaf19 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -438,8 +438,10 @@
 
                     sleep(10)
 
-                    salt.enforceState(saltMaster, 'I@elasticsearch:client', 'elasticsearch.client', true)
-                    salt.enforceState(saltMaster, 'I@kibana:client', 'kibana.client', true)
+                    salt.runSaltProcessStep(saltMaster, 'I@elasticsearch.client', 'cmd.run', ['salt-call state.sls elasticsearch.client'], null, true)
+                    // salt.enforceState(saltMaster, 'I@elasticsearch:client', 'elasticsearch.client', true)
+                    salt.runSaltProcessStep(saltMaster, 'I@kibana.client', 'cmd.run', ['salt-call state.sls kibana.client'], null, true)
+                    // salt.enforceState(saltMaster, 'I@kibana:client', 'kibana.client', true)
 
                     // install monitor
                     // Restart salt-minion to make sure that it uses the latest Jinja library
@@ -457,6 +459,7 @@
                     // Install collectd, heka and sensu services on the nodes, this will also
                     // generate the metadata that goes into the grains and eventually into Salt Mine
                     salt.enforceState(saltMaster, '*', 'collectd', true)
+                    salt.enforceState(saltMaster, '*', 'salt.minion', true)
                     salt.enforceState(saltMaster, '*', 'heka', true)
 
                     // Gather the Grafana metadata as grains