diff --git a/templates/overcloud_upgrade_prepare.sh.j2 b/templates/overcloud_upgrade_prepare.sh.j2
index a9cfd20b..a906ac85 100644
--- a/templates/overcloud_upgrade_prepare.sh.j2
+++ b/templates/overcloud_upgrade_prepare.sh.j2
@@ -50,7 +50,11 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
     -e {{ tht_directory }}/environments/services/neutron-ovs.yaml \
     {% endif -%}
     {% if upgrade_prepare_extra_params and upgrade_prepare_extra_params|string -%}
+    {% if ',' in upgrade_prepare_extra_params -%}
+    -e {{ upgrade_prepare_extra_params.split(',') | join(' -e ') }} \
+    {% else -%}
     -e {{ upgrade_prepare_extra_params }} \
+    {% endif -%}
     {% elif upgrade_prepare_extra_params and upgrade_prepare_extra_params|list -%}
     -e {{ upgrade_prepare_extra_params | join(' -e ') }} \
     {% endif -%}