diff --git a/test-salt-formulas-env.groovy b/test-salt-formulas-env.groovy
index 47cd110..42966e9 100644
--- a/test-salt-formulas-env.groovy
+++ b/test-salt-formulas-env.groovy
@@ -137,7 +137,7 @@
                 }
                 ruby.ensureRubyEnv()
                 if (!fileExists("Gemfile")) {
-                  sh("curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'")
+                  sh("curl -s 'https://gerrit.mcp.mirantis.com/projects/salt-formulas%2Fsalt-formulas-scripts/branches/master/files/Gemfile/content' | base64 -d > ./Gemfile")
                   ruby.installKitchen()
                 } else {
                   common.infoMsg("Override Gemfile found in the kitchen directory, using it.")
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 09a7f6c..a071058 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -185,7 +185,7 @@
               def kitchenEnvs = []
               ruby.ensureRubyEnv()
               if (!fileExists("Gemfile")) {
-                sh("curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'")
+                sh("curl -s 'https://gerrit.mcp.mirantis.com/projects/salt-formulas%2Fsalt-formulas-scripts/branches/master/files/Gemfile/content' | base64 -d > ./Gemfile")
                 ruby.installKitchen()
               } else {
                 common.infoMsg("Override Gemfile found in the kitchen directory, using it.")
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 7f0c72d..e99ec60 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -621,6 +621,7 @@
                     packageUpgradeMode = 'upgrade'
                 }
                 applyWorkarounds = driveTrainParams.get('APPLY_MODEL_WORKAROUNDS', true).toBoolean()
+                archiveInventory = driveTrainParams.get('ARCHIVE_RECLASS_INVENTORY', false).toBoolean()
             } else {
                 // backward compatibility for 2018.11.0
                 saltMastURL = env.getProperty('SALT_MASTER_URL')
@@ -662,9 +663,10 @@
 
                 common.infoMsg('Perform: Validate reclass medata before processing')
                 validateReclassModel(minions, 'before')
-
-                common.infoMsg('Perform: archiveReclassInventory before upgrade')
-                archiveReclassInventory(inventoryBeforeFilename)
+                if (archiveInventory) {
+                    common.infoMsg('Perform: archiveReclassInventory before upgrade')
+                    archiveReclassInventory(inventoryBeforeFilename)
+                }
 
                 try {
                     salt.cmdRun(venvPepper, 'I@salt:master', 'cd /srv/salt/reclass/ && git status && git diff-index --quiet HEAD --')
@@ -822,9 +824,10 @@
                     error('Reclass fails rendering. Pay attention to your cluster model.' +
                         'ErrorMessage:' + ex.toString())
                 }
-
-                common.infoMsg('Perform: archiveReclassInventory AFTER upgrade')
-                archiveReclassInventory(inventoryAfterFilename)
+                if (archiveInventory) {
+                    common.infoMsg('Perform: archiveReclassInventory AFTER upgrade')
+                    archiveReclassInventory(inventoryAfterFilename)
+                }
 
                 sh "diff -u $inventoryBeforeFilename $inventoryAfterFilename > reclass-inventory-diff.out || true"
                 archiveArtifacts artifacts: "reclass-inventory-diff.out"