diff --git a/templates/fast-forward-upgrade/overcloud_upgrade_nodes.sh.j2 b/templates/fast-forward-upgrade/overcloud_upgrade_nodes.sh.j2
index 6c62d50a..bbad896c 100644
--- a/templates/fast-forward-upgrade/overcloud_upgrade_nodes.sh.j2
+++ b/templates/fast-forward-upgrade/overcloud_upgrade_nodes.sh.j2
@@ -5,5 +5,5 @@ set -euo pipefail
 source {{ undercloud_rc }}
 openstack overcloud upgrade run \
     --stack {{ overcloud_stack_name }} \
-    --nodes {{ item }} \
+    --limit {{ item }} \
     --skip-tags validation | tee {{ working_dir}}/overcloud_upgrade_{{ item }}.log
diff --git a/templates/fast-forward-upgrade/overcloud_upgrade_role.sh.j2 b/templates/fast-forward-upgrade/overcloud_upgrade_role.sh.j2
index bec9f4db..26501db4 100644
--- a/templates/fast-forward-upgrade/overcloud_upgrade_role.sh.j2
+++ b/templates/fast-forward-upgrade/overcloud_upgrade_role.sh.j2
@@ -8,5 +8,5 @@ openstack overcloud upgrade run \
     {% if overcloud_ssh_user %}
     --ssh-user {{ overcloud_ssh_user }} \
     {% endif %}
-    --roles {{ item }} \
+    --limit {{ item }} \
     --skip-tags validation | tee {{ working_dir}}/overcloud_upgrade_{{ item }}.log
diff --git a/templates/overcloud_update_run.sh.j2 b/templates/overcloud_update_run.sh.j2
index ee55d0fd..1a16e40d 100644
--- a/templates/overcloud_update_run.sh.j2
+++ b/templates/overcloud_update_run.sh.j2
@@ -16,7 +16,7 @@ openstack overcloud update run \
     {% if tripleo_upgrade_debug|bool %}
     --debug \
     {% endif %}
-    --nodes {{ item }} --playbook {{ playbook }} 2>&1
+    --limit {{ item }} --playbook {{ playbook }} 2>&1
 
     {%- endfor -%}
 
@@ -28,6 +28,6 @@ openstack overcloud update run \
     {% if tripleo_upgrade_debug|bool %}
     --debug \
     {% endif %}
-    --nodes {{ item }} --playbook all 2>&1
+    --limit {{ item }} --playbook all 2>&1
 
 {% endif %}
diff --git a/templates/overcloud_upgrade_run.sh.j2 b/templates/overcloud_upgrade_run.sh.j2
index c65339e2..a4851b68 100644
--- a/templates/overcloud_upgrade_run.sh.j2
+++ b/templates/overcloud_upgrade_run.sh.j2
@@ -36,7 +36,7 @@ openstack overcloud upgrade run \
         {% if tripleo_upgrade_debug|bool -%}
         --debug \
         {% endif -%}
-        --roles {{ item }} --playbook {{ playbook }} 2>&1
+        --limit {{ item }} --playbook {{ playbook }} 2>&1
 
 echo "[$(date)] Finished major upgrade {{ playbook }} playbook for {{ item }} role"
 
@@ -97,7 +97,7 @@ openstack overcloud upgrade run \
         {% if tripleo_upgrade_debug|bool %}
         --debug \
         {% endif -%}
-        --roles {{ item }} --playbook all 2>&1
+        --limit {{ item }} --playbook all 2>&1
 
 echo "[$(date)] Finished major upgrade for {{ item }} role"