diff --git a/doc/source/user/manual-upgrade.rst b/doc/source/user/manual-upgrade.rst
index 8b04a0fb98..a300041f53 100644
--- a/doc/source/user/manual-upgrade.rst
+++ b/doc/source/user/manual-upgrade.rst
@@ -149,7 +149,7 @@ Before installing the infrastructure and OpenStack, update the host machines.
 
 .. code-block:: console
 
-    # openstack-ansible setup-hosts.yml --limit '!galera_all'
+    # openstack-ansible setup-hosts.yml --limit '!galera_all:!neutron_agent:!rabbitmq_all'
 
 This command is the same setting up hosts on a new installation. The
 ``galera_all`` host group is excluded to prevent reconfiguration and
@@ -163,7 +163,7 @@ Update the Galera container configuration independently.
 .. code-block:: console
 
     # openstack-ansible lxc-containers-create.yml -e \
-    'lxc_container_allow_restarts=false' --limit galera_all
+    'lxc_container_allow_restarts=false' --limit 'galera_all:neutron_agent:rabbitmq_all'
 
 This command is a subset of the host setup playbook, limited to the
 ``galera_all`` host group. The configuration of those containers is
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index 95cb93a7ce..c133a0ca2b 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -177,10 +177,10 @@ function main {
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/user-secrets-adjustment.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/pip-conf-removal.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ceph-galaxy-removal.yml")
-        # we don't want to trigger galera container restarts yet
-        RUN_TASKS+=("setup-hosts.yml --limit '!galera_all'")
-        # add new container config to galera containers but don't restart
-        RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit galera_all")
+        # we don't want to trigger container restarts for these groups yet
+        RUN_TASKS+=("setup-hosts.yml --limit '!galera_all:!neutron_agent:!rabbitmq_all'")
+        # add new container config to containers but don't restart
+        RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit 'galera_all:neutron_agent:rabbitmq_all'")
         # setup infra
         RUN_TASKS+=("unbound-install.yml")
         RUN_TASKS+=("repo-install.yml")