diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 079f5eb22a..aa371a4835 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -834,7 +834,7 @@ outputs:
       fast_forward_upgrade_bootstrap_role_tasks: |
 {%- for role in roles %}
                 - include_tasks: {{role.name}}/fast_forward_upgrade_tasks.yaml
-                  when: tripleo_role_name == '{{role.name}}' and ansible_hostname == {{role.name}}[0]
+                  when: tripleo_role_name == '{{role.name}}' and ansible_hostname == groups['{{role.name}}'][0]
 {%- endfor %}
       post_update_steps_tasks: |
 {%- for role in roles %}