diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index e9c0e14..7585a01 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -30,8 +30,6 @@
 pepperEnv = "pepperEnv"
 flags = CLUSTER_FLAGS.tokenize(',')
 
-def runHighState = RUNHIGHSTATE
-
 def backup(master, target) {
     stage("backup ${target}") {
 
@@ -124,9 +122,6 @@
                 }
 
                 ceph.waitForHealthy(master, ADMIN_HOST, flags)
-                if(runHighState) {
-                    salt.enforceHighstate(master, "I@ceph:${target}")
-                }
             }
 
             stage("Verify services for ${minion}") {
@@ -246,6 +241,11 @@
                 if (TARGET_RELEASE == 'nautilus' ) {
                     salt.cmdRun(pepperEnv, ADMIN_HOST, "ceph mon enable-msgr2")
                 }
+                if(RUNHIGHSTATE.toBoolean()) {
+                    salt.enforceHighstate(pepperEnv, "I@ceph:mon or I@ceph:mgr", '', false, true, 1)
+                    salt.enforceHighstate(pepperEnv, "I@ceph:radosgw", '', false, true, 1)
+                    salt.enforceHighstate(pepperEnv, "I@ceph:osd", '', false, true, 1)
+                }
             }
         }