diff --git a/doc/source/upgrade-guide/manual-upgrade.rst b/doc/source/upgrade-guide/manual-upgrade.rst
index 25fd228ea7..165b08c474 100644
--- a/doc/source/upgrade-guide/manual-upgrade.rst
+++ b/doc/source/upgrade-guide/manual-upgrade.rst
@@ -246,8 +246,10 @@ See :ref:`setup-infra-playbook` for details.
 
 .. code-block:: console
 
+    # openstack-ansible unbound-install.yml
     # openstack-ansible memcached-install.yml
     # openstack-ansible rabbitmq-install.yml -e 'rabbitmq_upgrade=true'
+    # openstack-ansible etcd-install.yml
     # openstack-ansible utility-install.yml
     # openstack-ansible rsyslog-install.yml
 
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index dd64d041fa..f6fa1f3b3e 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -167,8 +167,10 @@ function main {
         # explicitly perform controlled galera cluster restart
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/galera-cluster-rolling-restart.yml")
         # individually run each of the remaining plays from setup-infrastructure
+        RUN_TASKS+=("unbound-install.yml")
         RUN_TASKS+=("memcached-install.yml")
         RUN_TASKS+=("rabbitmq-install.yml -e 'rabbitmq_upgrade=true'")
+        RUN_TASKS+=("etcd-install.yml")
         RUN_TASKS+=("utility-install.yml")
         RUN_TASKS+=("rsyslog-install.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/memcached-flush.yml")