diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index ab38698..e20e579 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -530,6 +530,8 @@
         """
         job_parameters = {
             "TARGET_SERVERS": target,
+            "OS_DIST_UPGRADE": True,
+            "OS_UPGRADE": True,
             "INTERACTIVE": False}
         upgrade_control_pipeline = drivetrain_actions.start_job_on_cid_jenkins(
             job_name="deploy-upgrade-control",
@@ -539,10 +541,14 @@
 
     @pytest.mark.grab_versions
     @pytest.mark.run_mcp_update
-    def test__update__data_plane(self, drivetrain_actions):
+    def test__update__data_plane(self, drivetrain_actions, salt_actions):
         """Start 'Deploy - upgrade OVS gateway'
         """
+        if not salt_actions.cmd_run("gtw*", "test.ping")[0].keys():
+            pytest.skip("This deployment doesn't have gtw* nodes")
         job_parameters = {
+            "OS_DIST_UPGRADE": True,
+            "OS_UPGRADE": True,
             "INTERACTIVE": False}
         upgrade_data_pipeline = drivetrain_actions.start_job_on_cid_jenkins(
             job_name="deploy-upgrade-ovs-gateway",
@@ -556,6 +562,8 @@
         """Start 'Deploy - upgrade computes'
         """
         job_parameters = {
+            "OS_DIST_UPGRADE": True,
+            "OS_UPGRADE": True,
             "INTERACTIVE": False}
         upgrade_compute_pipeline = drivetrain_actions.start_job_on_cid_jenkins(
             job_name="deploy-upgrade-compute",