diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 9bdce1a..d8955e3 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -14,52 +14,53 @@
 def common = new com.mirantis.mk.Common()
 def python = new com.mirantis.mk.Python()
 def venvPepper = "venvPepper"
+timeout(time: 12, unit: 'HOURS') {
+    node("python") {
+        try {
+            python.setupPepperVirtualenv(venvPepper, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
 
-node("python") {
-    try {
-        python.setupPepperVirtualenv(venvPepper, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
+            stage("Update Reclass"){
+                common.infoMsg("Updating reclass model")
+                salt.cmdRun(venvPepper, "I@salt:master", 'cd /srv/salt/reclass && git pull -r && git submodule update', false)
+                salt.runSaltProcessStep(venvPepper, 'I@salt:master', 'cmd.run', ['reclass-salt --top'], null, true)
+                salt.enforceState(venvPepper, "I@salt:master", 'reclass', true)
+            }
 
-        stage("Update Reclass"){
-            common.infoMsg("Updating reclass model")
-            salt.cmdRun(venvPepper, "I@salt:master", 'cd /srv/salt/reclass && git pull -r && git submodule update', false)
-            salt.runSaltProcessStep(venvPepper, 'I@salt:master', 'cmd.run', ['reclass-salt --top'], null, true)
-            salt.enforceState(venvPepper, "I@salt:master", 'reclass', true)
-        }
+            if(UPDATE_LOCAL_REPOS.toBoolean()){
+                stage("Update local repos"){
+                    common.infoMsg("Updating local repositories")
+                    salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.run', ["aptly mirror list --raw | grep -E '*' | xargs -n 1 aptly mirror drop -force", 'runas=aptly'], null, true)
+                    salt.enforceState(venvPepper, '*apt*', 'aptly', true)
+                    salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.script', ['salt://aptly/files/aptly_mirror_update.sh', "args=-sv", 'runas=aptly'], null, true)
+                    salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.script', ['salt://aptly/files/aptly_publish_update.sh', "args=-acfrv", 'runas=aptly'], null, true)
 
-        if(UPDATE_LOCAL_REPOS.toBoolean()){
-            stage("Update local repos"){
-                common.infoMsg("Updating local repositories")
-                salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.run', ["aptly mirror list --raw | grep -E '*' | xargs -n 1 aptly mirror drop -force", 'runas=aptly'], null, true)
-                salt.enforceState(venvPepper, '*apt*', 'aptly', true)
-                salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.script', ['salt://aptly/files/aptly_mirror_update.sh', "args=-sv", 'runas=aptly'], null, true)
-                salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.script', ['salt://aptly/files/aptly_publish_update.sh', "args=-acfrv", 'runas=aptly'], null, true)
+                    salt.enforceState(venvPepper, '*apt*', 'docker.client.registry', true)
 
-                salt.enforceState(venvPepper, '*apt*', 'docker.client.registry', true)
+                    salt.enforceState(venvPepper, '*apt*', 'git server', true)
 
-                salt.enforceState(venvPepper, '*apt*', 'git server', true)
+                    salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.run', ['pip2pi /srv/pypi_mirror/packages/ -r /srv/pypi_mirror/requirements.txt'], null, true)
 
-                salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.run', ['pip2pi /srv/pypi_mirror/packages/ -r /srv/pypi_mirror/requirements.txt'], null, true)
+                    salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.run', ['/srv/scripts/update-images.sh'], null, true)
+                }
+            }
 
-                salt.runSaltProcessStep(venvPepper, '*apt*', 'cmd.run', ['/srv/scripts/update-images.sh'], null, true)
+            stage("Update APT repos"){
+                common.infoMsg("Updating APT repositories")
+                salt.enforceState(venvPepper, "I@linux:system", 'linux.system.repo', true)
+            }
+
+            stage("Update formulas"){
+                common.infoMsg("Updating salt formulas")
+                salt.cmdRun(venvPepper, "I@salt:master", 'apt-get clean && apt-get update && apt-get install -y salt-formula-*')
+
+                common.infoMsg("Running salt sync-all")
+                salt.runSaltProcessStep(venvPepper, '*', 'saltutil.sync_all', [], null, true)
             }
         }
-
-        stage("Update APT repos"){
-            common.infoMsg("Updating APT repositories")
-            salt.enforceState(venvPepper, "I@linux:system", 'linux.system.repo', true)
+        catch (Throwable e) {
+            // If there was an error or exception thrown, the build failed
+            currentBuild.result = "FAILURE"
+            throw e
         }
-
-        stage("Update formulas"){
-            common.infoMsg("Updating salt formulas")
-            salt.cmdRun(venvPepper, "I@salt:master", 'apt-get clean && apt-get update && apt-get install -y salt-formula-*')
-
-            common.infoMsg("Running salt sync-all")
-            salt.runSaltProcessStep(venvPepper, '*', 'saltutil.sync_all', [], null, true)
-        }
-    }
-    catch (Throwable e) {
-        // If there was an error or exception thrown, the build failed
-        currentBuild.result = "FAILURE"
-        throw e
     }
 }
\ No newline at end of file