diff --git a/tcp_tests/tests/system/test_upgrade_pike_queens.py b/tcp_tests/tests/system/test_upgrade_pike_queens.py
index 4db22e3..1f206f1 100644
--- a/tcp_tests/tests/system/test_upgrade_pike_queens.py
+++ b/tcp_tests/tests/system/test_upgrade_pike_queens.py
@@ -188,8 +188,8 @@
         job_name = 'deploy-upgrade-control'
         job_parameters = {
             'INTERACTIVE': False,
-            'OS_DIST_UPGRADE': False,
-            'OS_UPGRADE': False
+            'OS_DIST_UPGRADE': True,
+            'OS_UPGRADE': True
         }
         # ####### Run job for ctl* ###
         job_parameters["TARGET_SERVERS"] = "ctl*"
@@ -222,25 +222,29 @@
         # ########## Upgrade gateway nodes  ###########
         show_step(3)
         LOG.info('Upgrade gateway')
-        job_name = 'deploy-upgrade-ovs-gateway'
-        job_parameters = {
-            'INTERACTIVE': False,
-            'OS_DIST_UPGRADE': False,
-            'OS_UPGRADE': False,
-            'TARGET_SERVERS': "gtw*"
-        }
-        update_gateway = dt.start_job_on_cid_jenkins(
-            job_name=job_name,
-            job_parameters=job_parameters)
-        assert update_gateway == 'SUCCESS'
+        if salt_actions.cmd_run("gtw*", "test.ping")[0].keys():
+            job_name = 'deploy-upgrade-ovs-gateway'
+            job_parameters = {
+                'INTERACTIVE': False,
+                'OS_DIST_UPGRADE': True,
+                'OS_UPGRADE': True,
+                'TARGET_SERVERS': "gtw*"
+            }
+            update_gateway = dt.start_job_on_cid_jenkins(
+                job_name=job_name,
+                job_parameters=job_parameters)
+            assert update_gateway == 'SUCCESS'
+        else:
+            LOG.info("This deployment doesn't have gtw* nodes, \
+            so skip this step")
         # ############ Upgrade compute nodes  ############
         show_step(4)
         LOG.info('Upgrade compute nodes')
         job_name = 'deploy-upgrade-compute'
         job_parameters = {
             'INTERACTIVE': False,
-            'OS_DIST_UPGRADE': False,
-            'OS_UPGRADE': False,
+            'OS_DIST_UPGRADE': True,
+            'OS_UPGRADE': True,
             'TARGET_SERVERS': "cmp*"
         }
         update_computes = dt.start_job_on_cid_jenkins(