diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index c0a5636..63a5bd5 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -242,11 +242,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(pepperEnv, "I@ceph:common", "ceph.common")
             }
         }
 
diff --git a/sync-http-to-s3.groovy b/sync-http-to-s3.groovy
index 44ec92b..3eeaece 100644
--- a/sync-http-to-s3.groovy
+++ b/sync-http-to-s3.groovy
@@ -19,7 +19,7 @@
                                   usernameVariable: 'S3_ACCESS_KEY', passwordVariable: 'S3_SECRET_KEY']]) {
                     img.inside("-e S3_ACCESS_KEY=${S3_ACCESS_KEY} -e S3_SECRET_KEY=${S3_SECRET_KEY}") {
                         common.retry(3, 5) {
-                            sh(script: "wget --progress=dot:giga -O ${filename} ${url}", returnStdout: true)
+                            sh(script: "wget --progress=dot:giga --tries=50 -O ${filename} ${url}", returnStdout: true)
                             sh(script: "/usr/local/bin/s4cmd put ${opts} ${filename} ${DEST}/${filename}", returnStdout: true)
                         }
                     }