diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index d379937715..dafc5bf615 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -662,6 +662,7 @@ outputs:
               name: Run update
               serial: 1
               gather_facts: no
+              any_errors_fatal: yes
               vars:
                 container_cli: CONTAINER_CLI
               tasks:
@@ -765,6 +766,7 @@ outputs:
               name: Run pre-upgrade rolling tasks
               serial: 1
               gather_facts: no
+              any_errors_fatal: yes
               tasks:
                 - include_tasks: pre_upgrade_rolling_steps_tasks.yaml
                   with_sequence: start=0 end={{pre_upgrade_rolling_steps_max-1}}
@@ -783,6 +785,7 @@ outputs:
             CONTAINER_CLI: {get_param: ContainerCli}
           template: |
             - hosts: DEPLOY_TARGET_HOST
+              any_errors_fatal: yes
               tasks:
                 - include_tasks: upgrade_steps_tasks.yaml
                   with_sequence: start=0 end={{upgrade_steps_max-1}}
@@ -803,6 +806,7 @@ outputs:
             CONTAINER_CLI: {get_param: ContainerCli}
           template: |
             - hosts: DEPLOY_TARGET_HOST
+              any_errors_fatal: yes
               tasks:
                 - include_tasks: post_upgrade_steps_tasks.yaml
                   with_sequence: start=0 end={{post_upgrade_steps_max-1}}
@@ -879,6 +883,7 @@ outputs:
             DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
           template: |
             - hosts: DEPLOY_TARGET_HOST
+              any_errors_fatal: yes
               tasks:
                 - set_fact:
                     releases: {get_param: [FastForwardUpgradeReleases]}