diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 4b01197683..fa1e223adf 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@ -58,11 +58,8 @@ if [[ -n $(is_bootstrap_node) ]]; then
     check_resource redis stopped 600
     pcs resource disable rabbitmq
     check_resource rabbitmq stopped 600
-    pcs resource disable galera
-    check_resource galera stopped 600
     pcs resource disable openstack-cinder-volume
     check_resource openstack-cinder-volume stopped 600
-
     # We want to remove any duplicate/leftover cinder service
     # leftover in the database.
     cinder-manage service list | \
@@ -71,6 +68,8 @@ if [[ -n $(is_bootstrap_node) ]]; then
             cinder-manage service remove $service $host;
         done
 
+    pcs resource disable galera
+    check_resource galera stopped 600
     # Disable all VIPs before stopping the cluster, so that pcs doesn't use one as a source address:
     #   https://bugzilla.redhat.com/show_bug.cgi?id=1330688
     for vip in $(pcs resource show | grep ocf::heartbeat:IPaddr2 | grep Started | awk '{ print $1 }'); do