diff --git a/templates/overcloud_upgrade_converge.sh.j2 b/templates/overcloud_upgrade_converge.sh.j2
index f40a556c..6c6e15c8 100644
--- a/templates/overcloud_upgrade_converge.sh.j2
+++ b/templates/overcloud_upgrade_converge.sh.j2
@@ -55,7 +55,7 @@ openstack overcloud upgrade converge ${CONVERGE_ANSWER} \
     {% endif -%}
     {% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
     {% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
-        -e {{ _env }} \
+        -e {{ _env  | replace('services-docker', 'services') }} \
     {% endfor -%}
     {% endif -%}
     {% if ffu_overcloud_upgrade and deployment_with_ha_upstream -%}
diff --git a/templates/overcloud_upgrade_prepare.sh.j2 b/templates/overcloud_upgrade_prepare.sh.j2
index e3d113d9..4bfe4d65 100644
--- a/templates/overcloud_upgrade_prepare.sh.j2
+++ b/templates/overcloud_upgrade_prepare.sh.j2
@@ -34,7 +34,7 @@ openstack overcloud upgrade prepare ${PREPARE_ANSWER} \
     {% endif -%}
     {% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
     {% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
-    -e {{ _env }} \
+    -e {{ _env  | replace('services-docker', 'services') }} \
     {% endfor -%}
     {% endif -%}
     {% if ffu_overcloud_upgrade and deployment_with_ha_upstream -%}