diff --git a/tasks/fast-forward-upgrade/overcloud_role.yaml b/tasks/fast-forward-upgrade/overcloud_role.yaml
index 2460caf3..4af9a10a 100644
--- a/tasks/fast-forward-upgrade/overcloud_role.yaml
+++ b/tasks/fast-forward-upgrade/overcloud_role.yaml
@@ -18,11 +18,11 @@
   when: ffu_upgrade_workarounds|bool
   tags: ffu_overcloud_upgrade_controller
 
-- name: run FFU controller ugrade scripts
+- name: run FFU control plane ugrade scripts
   command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
   tags: ffu_overcloud_upgrade_controller
   with_items:
-    - "{{ oc_roles|intersect(['Controller']) }}"
+    - "{{ oc_roles|difference(['Compute','ComputeAlt','CephStorage']) }}"
 
 - include: "{{ item }}"
   with_items:
diff --git a/templates/ceph-upgrade-run.sh.j2 b/templates/ceph-upgrade-run.sh.j2
index 0cc219d6..7a9b3e80 100644
--- a/templates/ceph-upgrade-run.sh.j2
+++ b/templates/ceph-upgrade-run.sh.j2
@@ -32,6 +32,6 @@ openstack overcloud ceph-upgrade run \
     --disable-validations \
     --deployed-server \
     {% endif %}
-    {% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
+    {% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1
 
 echo "[$(date)] Finished CEPH upgrade"
diff --git a/templates/overcloud_upgrade_converge.sh.j2 b/templates/overcloud_upgrade_converge.sh.j2
index 10750fbe..7833c32d 100644
--- a/templates/overcloud_upgrade_converge.sh.j2
+++ b/templates/overcloud_upgrade_converge.sh.j2
@@ -59,7 +59,7 @@ openstack overcloud {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgra
     -e {{working_dir}}/ceph-ansible-env.yaml \
     {% endif %}
     {% endif %}
-    {% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
+    {% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1
 
 
 echo "[$(date)] Finished {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} major {% endif %}upgrade converge step"
diff --git a/templates/overcloud_upgrade_prepare.sh.j2 b/templates/overcloud_upgrade_prepare.sh.j2
index 10687959..d421421a 100644
--- a/templates/overcloud_upgrade_prepare.sh.j2
+++ b/templates/overcloud_upgrade_prepare.sh.j2
@@ -44,4 +44,4 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
     -e {{ upgrade_prepare_extra_params | join(' -e ') }} \
     {% endif %}
     -e {{ working_dir }}/{{ container_registry_file }} \
-    {% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
+    {% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1