diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 463bc24..90d3db7 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -148,19 +148,6 @@
         deploy(shared, common, steps, env_manager, batch_size, dist_upgrade_nodes, upgrade_saltstack)
         // run test stages
         test(shared, common, steps, env_manager)
-        //run upgrade env to proposed
-        if (env.RUN_UPGRADE_AFTER_JOB == "true") {
-            network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
-            upgrade_job = "mcp-update-${env.TEMPEST_IMAGE_VERSION}-${network_backend}-sl"
-              def deploy = build job: "${upgrade_job}",
-                  parameters: [
-                      string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.LAB_CONFIG_NAME}"),
-                      string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
-                      string(name: 'NODE', value: "openstack_slave_${env.LAB_CONFIG_NAME}")
-                  ],
-                  wait: false,
-                  propagate: false
-        }
     } catch (e) {
         common.printMsg("Job is failed: " + e.message, "purple")
         throw e
@@ -223,7 +210,19 @@
                 } // node
             }
         }
-
+        //run upgrade env to proposed
+        if (env.RUN_UPGRADE_AFTER_JOB == "true") {
+            network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
+            upgrade_job = "mcp-update-${env.TEMPEST_IMAGE_VERSION}-${network_backend}-sl"
+              def deploy = build job: "${upgrade_job}",
+                  parameters: [
+                      string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.LAB_CONFIG_NAME}"),
+                      string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
+                      string(name: 'NODE', value: "openstack_slave_${env.LAB_CONFIG_NAME}")
+                  ],
+                  wait: false,
+                  propagate: false
+        }
     } // try
   } // node