diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index ca89b4497b..492f36f348 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -16,10 +16,10 @@
 # primary role is: {{primary_role_name}}
 {% set deploy_steps_max = 6 -%}
 {% set update_steps_max = 6 -%}
-{% set external_update_steps_max = 1 -%}
+{% set external_update_steps_max = 2 -%}
 {% set pre_upgrade_rolling_steps_max = 1 -%}
 {% set upgrade_steps_max = 6 -%}
-{% set external_upgrade_steps_max = 1 -%}
+{% set external_upgrade_steps_max = 2 -%}
 {% set post_upgrade_steps_max = 4 -%}
 {% set fast_forward_upgrade_steps_max = 9 -%}
 {% set fast_forward_upgrade_prep_steps_max = 3 -%}
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index be482c0074..63c82df2d8 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -592,12 +592,16 @@ outputs:
                        curl_put_http_status.stdout == "201")
               when: local_ceph_ansible_fetch_directory_backup == ""
       external_update_tasks:
-        - name: set ceph_ansible_playbooks_default
+        - when: step|int == 0
           tags: ceph
-          set_fact:
-            ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml"]
+          block:
+            - name: set ceph_ansible_playbooks_default
+              set_fact:
+                ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml"]
       external_upgrade_tasks:
-        - name: set ceph_ansible_playbooks_default
+        - when: step|int == 0
           tags: ceph
-          set_fact:
-            ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml"]
+          block:
+            - name: set ceph_ansible_playbooks_default
+              set_fact:
+                ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml"]
diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index 0519d15f53..34d86763e4 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -436,7 +436,9 @@ outputs:
                     exit ${PIPESTATUS[0]}
 
       external_upgrade_tasks:
-        - name: set OpenShift upgrade facts
+        - when: step|int == 0
           tags: openshift
-          set_fact:
-            openshift_upgrade: true
+          block:
+            - name: set OpenShift upgrade facts
+              set_fact:
+                openshift_upgrade: true