diff --git a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
index c2ea6d4ec..c590e6d6a 100644
--- a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
@@ -62,10 +62,11 @@ fi
 
 ## * Deploy the overcloud!
 ## ::
-openstack overcloud deploy --stack {{ stack_name }}  {% if release is not in ['newton', 'ocata', 'pike', 'queens'] %}--override-ansible-cfg {{ working_dir }}/custom_ansible.cfg{% endif %} \
-    --templates {{overcloud_templates_path}} \
-    {{ deploy_args | regex_replace("\n", " ") }} \
-    "$@" && status_code=0 || status_code=$?
+openstack overcloud deploy --stack {{ stack_name }} \
+  {% if release is not in ['newton', 'ocata', 'pike', 'queens'] %}--override-ansible-cfg {{ working_dir }}/custom_ansible.cfg{% endif %} \
+  {% if release not in ['queens', 'stein', 'train', 'ussuri', 'victoria'] and not (ephemeral_heat|bool) %}--heat-type installed{% endif %} --templates {{overcloud_templates_path}} \
+  {{ deploy_args | regex_replace("\n", " ") }} \
+  "$@" && status_code=0 || status_code=$?
 
 ### --stop_docs