diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 0a277ab..ea28568 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -78,7 +78,7 @@
     return threads['return'][0].values()[0].replaceAll('Salt command execution success','').trim()
 }
 
-def wa29352(ArrayList saltMinions, String cname) {
+def wa29352(String cname) {
     // WA for PROD-29352. Issue cause due patch https://gerrit.mcp.mirantis.com/#/c/37932/12/openssh/client/root.yml
     // Default soft-param has been removed, what now makes not possible to render some old env's.
     // Like fix, we found copy-paste already generated key from backups, to secrets.yml with correct key name
@@ -141,7 +141,6 @@
         return
     }
     salt.fullRefresh(venvPepper, 'I@salt:master')
-    salt.fullRefresh(venvPepper, 'I@nova:compute')
     for (String minion in saltMinions) {
         // First attempt, second will be performed in next validateReclassModel() stages
         try {
@@ -184,8 +183,8 @@
 
             salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/$cname && " +
                 "grep -q '${wa29155ClassName}' infra/secrets.yml || sed -i '/classes:/ a - $wa29155ClassName' infra/secrets.yml")
-            salt.fullRefresh(venvPepper, 'cfg*')
-            salt.fullRefresh(venvPepper, 'cmp*')
+            salt.fullRefresh(venvPepper, 'I@salt:master')
+            salt.fullRefresh(venvPepper, saltMinions)
             patched = true
         }
     }
@@ -397,7 +396,9 @@
             def reclassSystemBranch = ''
             def reclassSystemBranchDefault = gitTargetMcpVersion
             def batchSize = ''
-            if (gitTargetMcpVersion != 'proposed') {
+            if (gitTargetMcpVersion ==~ /^\d\d\d\d\.\d\d?\.\d+$/) {
+                reclassSystemBranchDefault = "tags/${gitTargetMcpVersion}"
+            } else if (gitTargetMcpVersion != 'proposed') {
                 reclassSystemBranchDefault = "origin/${gitTargetMcpVersion}"
             }
             def driveTrainParamsYaml = env.getProperty('DRIVE_TRAIN_PARAMS')
@@ -430,6 +431,7 @@
             if (!batchSize) {
                 batchSize = getWorkerThreads(venvPepper)
             }
+            def computeMinions = salt.getMinions(venvPepper, 'I@nova:compute')
 
             stage('Update Reclass and Salt-Formulas') {
                 common.infoMsg('Perform: Full salt sync')
@@ -556,8 +558,7 @@
                     input message: 'Continue anyway?'
                 }
 
-                wa29352(minions, cluster_name)
-                def computeMinions = salt.getMinions(venvPepper, 'I@nova:compute')
+                wa29352(cluster_name)
                 wa29155(computeMinions, cluster_name)
 
                 try {
@@ -571,6 +572,8 @@
 
                 salt.fullRefresh(venvPepper, 'I@salt:master')
                 salt.enforceState(venvPepper, 'I@salt:master', 'reclass.storage', true, true, null, false, 60, 2)
+                salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/${cluster_name} && git status && " +
+                        "git add -u && git commit --allow-empty -m 'Reclass nodes update to the release ${targetMcpVersion} on ${common.getDatetime()}'")
                 try {
                     salt.enforceState(venvPepper, 'I@salt:master', 'reclass', true, true, null, false, 60, 2)
                 }
@@ -672,20 +675,14 @@
                     salt.enforceState(venvPepper, 'I@salt:master', 'nginx', true, true, null, false, 60, 2)
                 }
 
-                // Apply changes for HaProxy on CI/CD nodes
-                salt.enforceState(venvPepper, 'I@keepalived:cluster:instance:cicd_control_vip and I@haproxy:proxy', 'haproxy.proxy', true)
-
                 // Gerrit 2019.2.0 (2.13.6) version has wrong file name for download-commands plugin and was not loaded, let's remove if still there before upgrade
                 def gerritGlusterPath = salt.getPillar(venvPepper, 'I@gerrit:client', 'glusterfs:client:volumes:gerrit:path').get('return')[0].values()[0]
                 def wrongPluginJarName = "${gerritGlusterPath}/plugins/project-download-commands.jar"
-                salt.cmdRun(venvPepper, 'I@gerrit:client', "test -f ${wrongPluginJarName} && rm ${wrongPluginJarName}")
+                salt.cmdRun(venvPepper, 'I@gerrit:client', "test -f ${wrongPluginJarName} && rm ${wrongPluginJarName} || true")
 
                 salt.cmdRun(venvPepper, "I@salt:master", "salt -C 'I@jenkins:client and I@docker:client and not I@salt:master' state.sls docker.client --async")
-
                 sleep(180)
-
                 common.infoMsg('Perform: Checking if Docker containers are up')
-
                 try {
                     common.retry(20, 30) {
                         salt.cmdRun(venvPepper, 'I@jenkins:client and I@docker:client', "! docker service ls | tail -n +2 | grep -v -E '\\s([0-9])/\\1\\s'")
@@ -695,6 +692,9 @@
                     error("Docker containers for CI/CD services are having troubles with starting.")
                 }
 
+                // Apply changes for HaProxy on CI/CD nodes
+                salt.enforceState(venvPepper, 'I@keepalived:cluster:instance:cicd_control_vip and I@haproxy:proxy', 'haproxy.proxy', true)
+
                 salt.enforceState(venvPepper, 'I@jenkins:client and not I@salt:master', 'jenkins.client', true, true, null, false, 60, 2)
 
                 // update Nginx proxy settings for Jenkins/Gerrit if needed