diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index 7585a01..6b495be 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -241,11 +241,7 @@
                 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)
-                }
+                salt.enforceState(master, "I@ceph:common", "ceph.common")
             }
         }