diff --git a/tools/rabbitmq-quorum-migration.sh b/tools/rabbitmq-quorum-migration.sh
index c425e38bc5577ae8a6001bba49987643c8548c5a..92bb98204dd02b496046fe38c44fc419ea65e3da 100755
--- a/tools/rabbitmq-quorum-migration.sh
+++ b/tools/rabbitmq-quorum-migration.sh
@@ -12,13 +12,13 @@ if [[ ! $KAYOBE_CONFIG_PATH ]]; then
 fi
 
 if [[ ! "$1" = "--skip-upgrade" ]]; then
-    kayobe overcloud host command run --limit clc-ar17-u24 --become --command "cp -a /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.bak"
-    kayobe overcloud host command run --limit clc-ar17-u24 --become --command "sed -i '/neutron-netns-cleanup/,+3d' /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
-    kayobe overcloud host command run --limit clc-ar17-u24 --become --command "chattr +i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
+    kayobe overcloud host command run --limit controllers[2] --become --command "cp -a /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.bak"
+    kayobe overcloud host command run --limit controllers[2] --become --command "sed -i '/neutron-netns-cleanup/,+3d' /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
+    kayobe overcloud host command run --limit controllers[2] --become --command "chattr +i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
     kayobe kolla ansible run "rabbitmq-upgrade 3.12"
     sleep 360
     kayobe kolla ansible run "rabbitmq-upgrade 3.13"
-    kayobe overcloud host command run --limit clc-ar17-u24 --become --command "chattr -i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
+    kayobe overcloud host command run --limit controllers[2] --become --command "chattr -i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
 fi
 
 if [[ ! "$1" = "--skip-checks" ]]; then
@@ -39,8 +39,8 @@ fi
 
 # Generate new config, stop services using rabbit, and reset rabbit state
 kayobe overcloud service configuration generate --node-config-dir /etc/kolla --kolla-skip-tags rabbitmq-ha-precheck
-kayobe overcloud host command run --limit clc-ar17-u24 --become --command "sed -i '/neutron-netns-cleanup/,+3d' /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
-kayobe overcloud host command run --limit clc-ar17-u24 --become --command "chattr +i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
+kayobe overcloud host command run --limit controllers[2] --become --command "sed -i '/neutron-netns-cleanup/,+3d' /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
+kayobe overcloud host command run --limit controllers[2] --become --command "chattr +i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
 kayobe kolla ansible run "stop --yes-i-really-really-mean-it" -kt $RABBITMQ_SERVICES_TO_RESTART
 kayobe kolla ansible run rabbitmq-reset-state
 
@@ -71,4 +71,4 @@ if [[ ! "$1" = "--skip-checks" ]]; then
     fi
 fi
 
-kayobe overcloud host command run --limit clc-ar17-u24 --become --command "chattr -i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"
+kayobe overcloud host command run --limit controllers[2] --become --command "chattr -i /etc/kolla/neutron-l3-agent/neutron-l3-agent-wrapper.sh"