diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
index a38087863b..60e1215ef2 100644
--- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@@ -317,6 +317,23 @@ outputs:
                 tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}
 
       update_tasks:
+        # When a schema change happens, the newer slaves don't connect
+        # back to the older master and end up timing out.  So we clean
+        # up the error here until we get a fix for
+        # https://bugzilla.redhat.com/show_bug.cgi?id=1759974
+        - name: Clear ovndb cluster pacemaker error
+          shell: "pcs resource cleanup ovn-dbs-bundle"
+          when:
+            - step|int == 0
+        # Then we ban the resource for this node.  It has no effect on
+        # the first two controllers, but when we reach the last one,
+        # it avoids a cut in the control plane as master get chosen in
+        # one of the updated Stopped ovn.  They are in error, that why
+        # we need the cleanup just before.
+        - name: Ban ovndb resource on the current node.
+          shell: "pcs resource ban ovn-dbs-bundle $(hostname | cut -d. -f1)"
+          when:
+            - step|int == 0
         - name: Tear-down non-HA ovn-dbs containers
           when:
             - step|int == 1
@@ -330,23 +347,6 @@ outputs:
                   - ovn_north_db_server
                   - ovn_south_db_server
                   - ovn_northd
-        # When a schema change happens, the newer slaves don't connect
-        # back to the older master and end up timing out.  So we clean
-        # up the error here until we get a fix for
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1759974
-        - name: Clear ovndb cluster pacemaker error
-          shell: "pcs resource cleanup ovn-dbs-bundle"
-          when:
-            - step|int == 1
-        # Then we ban the resource for this node.  It has no effect on
-        # the first two controllers, but when we reach the last one,
-        # it avoids a cut in the control plane as master get chosen in
-        # one of the updated Stopped ovn.  They are in error, that why
-        # we need the cleanup just before.
-        - name: Ban ovndb resource on the current node.
-          shell: "pcs resource ban ovn-dbs-bundle $(hostname | cut -d. -f1)"
-          when:
-            - step|int == 1
         - name: ovn-dbs fetch and retag container image for pacemaker
           when:
             - step|int == 3