diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 141275e..7967116 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -480,18 +480,20 @@
     def salt = new com.mirantis.mk.Salt()
 
     //Install and Configure Docker
-    salt.enforceState(master, 'I@aptly:publisher', 'aptly.publisher')
-    salt.enforceState(master, 'I@docker:swarm:role:master and I@jenkins:client', 'docker.client', true)
+    salt.runSaltProcessStep(master, 'I@jenkins:client or I@gerrit:client', 'saltutil.refresh_pillar', [], null, true)
+    salt.runSaltProcessStep(master, 'I@jenkins:client or I@gerrit:client', 'saltutil.sync_all', [], null, true)
+
+    salt.enforceState(master, 'I@aptly:publisher', 'aptly.publisher',true, null, false, -1, 1)
+    salt.enforceState(master, 'I@docker:swarm:role:master and I@jenkins:client', 'docker.client', true, true, null, false, -1, 1)
     sleep(500)
-    salt.enforceState(master, 'I@aptly:server', 'aptly', true)
-    salt.enforceState(master, 'I@openldap:client', 'openldap', true)
+    salt.enforceState(master, 'I@aptly:server', 'aptly', true, true, null, false, -1, 1)
+    salt.enforceState(master, 'I@openldap:client', 'openldap', true, true, null, false, -1, 1)
 
     if (salt.testTarget(master, 'I@python:environment')) {
         salt.enforceState(master, 'I@python:environment', 'python', true)
     }
-
-    salt.enforceState(master, 'I@gerrit:client', 'gerrit', true)
-    salt.enforceState(master, 'I@jenkins:client', 'jenkins', true)
+    salt.enforceState(master, 'I@gerrit:client', 'gerrit', true, true, null, false, -1, 1)
+    salt.enforceState(master, 'I@jenkins:client', 'jenkins', true, true, null, false, -1, 1)
 }