diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/sw_update_testcase.py b/nfv/nfv-tests/nfv_unit_tests/tests/sw_update_testcase.py
index 2130eea8..3505cfbc 100755
--- a/nfv/nfv-tests/nfv_unit_tests/tests/sw_update_testcase.py
+++ b/nfv/nfv-tests/nfv_unit_tests/tests/sw_update_testcase.py
@@ -95,8 +95,8 @@ def validate_phase(phase, expected_results):
                                     (key, stage_number, stages_key,
                                      step_number, step_key,
                                      apply_step[step_key], step[step_key],
-                                     json.dumps(apply_step, indent=2),
-                                     json.dumps(step, indent=2))
+                                     json.dumps(step, indent=2),
+                                     json.dumps(apply_step, indent=2))
                             step_number += 1
                     else:
                         assert apply_stage[stages_key] == stage[stages_key], \
diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_deploy_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_deploy_strategy.py
index 7b331c4f..027fbbae 100755
--- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_deploy_strategy.py
+++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_deploy_strategy.py
@@ -1770,7 +1770,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                         {'name': 'system-stabilize', 'timeout': 15},
                         {'name': 'unlock-hosts',
                          'entity_names': ['compute-0', 'compute-1', 'compute-2']},
-                        {'name': 'wait-alarms-clear', 'timeout': 600},
+                        {'name': 'wait-alarms-clear', 'timeout': 2400},
                     ]
                 },
                 {
@@ -1891,7 +1891,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                         {'name': 'system-stabilize', 'timeout': 15},
                         {'name': 'unlock-hosts',
                          'entity_names': ['compute-0', 'compute-1', 'compute-2']},
-                        {'name': 'wait-alarms-clear', 'timeout': 600},
+                        {'name': 'wait-alarms-clear', 'timeout': 2400},
                     ]
                 },
                 {
diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py
index 4afaf319..7a0c6ddc 100755
--- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py
+++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py
@@ -288,7 +288,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-2', 'compute-3']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -306,7 +306,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-0']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -324,7 +324,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-1']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 }
             ]
@@ -401,7 +401,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-1', 'compute-5']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -422,7 +422,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                      _unlock_hosts_stage_as_dict(
                          ['compute-0', 'compute-2', 'compute-3']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -443,7 +443,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                      _unlock_hosts_stage_as_dict(
                          ['compute-4', 'compute-6', 'compute-7']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -463,7 +463,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                      _unlock_hosts_stage_as_dict(
                          ['compute-8', 'compute-9']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                  }
             ]
@@ -581,7 +581,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-1']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -603,7 +603,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                      _unlock_hosts_stage_as_dict(
                          ['compute-0', 'compute-2', 'compute-3']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -622,7 +622,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-4']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 }
             ]
@@ -717,7 +717,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(stage_hosts[0]),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                 },
             ]
@@ -741,7 +741,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(stage_hosts[x]),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                  }
             )
@@ -808,7 +808,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-2']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -825,7 +825,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-3']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -843,7 +843,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-0']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                 },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -861,7 +861,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-1']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                 },
             ]
@@ -917,7 +917,9 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                         {'name': 'system-stabilize', 'timeout': 15},
                         {'name': 'unlock-hosts',
                          'entity_names': [f'compute-{i}']},
-                        {'name': 'system-stabilize', 'timeout': 60},
+                        {'name': 'wait-alarms-clear',
+                         'ignore_alarms': IGNORE_ALARMS_LIST,
+                         'timeout': 2400}
                     ]
                 }
                 for i in range(4)
@@ -1533,7 +1535,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-1']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                  },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -1551,7 +1553,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                        'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-0']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600},
+                      'timeout': 2400},
                  ]
                  },
                 {'name': 'sw-upgrade-complete',
@@ -1666,7 +1668,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-1']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                  },
                 {'name': 'sw-upgrade-worker-hosts',
@@ -1683,7 +1685,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
                       'timeout': 15},
                      _unlock_hosts_stage_as_dict(['compute-0']),
                      {'name': 'wait-alarms-clear',
-                      'timeout': 600}
+                      'timeout': 2400}
                  ]
                  },
                 {'name': 'sw-upgrade-complete',
diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py
index 8eaf161a..f1895754 100755
--- a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py
+++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py
@@ -1345,7 +1345,13 @@ class UpdateWorkerHostsMixin(object):
                 # alarms to clear. Note: not all controller nodes will have
                 # OSDs configured, but the alarms should clear quickly in
                 # that case so this will not delay the update strategy.
-                if any([HOST_PERSONALITY.CONTROLLER in host.personality
+                if isinstance(self, SwUpgradeStrategy):
+                    # TODO(jkraitbe): Workers can now support OSDs but VIM lacks a way to check.
+                    stage.add_step(strategy.WaitAlarmsClearStep(
+                                timeout_in_secs=WAIT_ALARM_TIMEOUT,
+                                ignore_alarms=self._ignore_alarms,
+                                ignore_alarms_conditional=self._ignore_alarms_conditional))
+                elif any([HOST_PERSONALITY.CONTROLLER in host.personality
                         for host in hosts_to_lock + hosts_to_reboot]):
                     # Multiple personality nodes that need to wait for OSDs to sync:
                     stage.add_step(strategy.WaitAlarmsClearStep(