diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py
index 74c99dd25..505a65dd0 100644
--- a/tripleoclient/config/standalone.py
+++ b/tripleoclient/config/standalone.py
@@ -106,6 +106,10 @@ class StandaloneConfig(BaseConfig):
                         help=_('Whether to enable the neutron service.')),
             cfg.BoolOpt('enable_heat',
                         default=heat,
+                        deprecated_for_removal=True,
+                        deprecated_reason=('Heat has been replaced by the '
+                                           'heat-ephemeral service and this '
+                                           'option has been deprecated.'),
                         help=_('Whether to enable the heat service.')),
 
         ]
diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py
index 4e58c6684..41922100c 100644
--- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py
+++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py
@@ -91,8 +91,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -154,8 +152,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/home/stack/foo.yaml', '-e',
              '/usertht/environments/services/ironic.yaml', '-e',
              '/usertht/environments/services/ironic-inspector.yaml', '-e',
-             '/usertht/environments/'
-             'disable-heat.yaml', '-e',
              '/usertht/environments/services/'
              'undercloud-remove-novajoin.yaml', '-e',
              '/usertht/environments/'
@@ -318,8 +314,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -384,8 +378,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -446,8 +438,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -505,8 +495,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -599,8 +587,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -688,8 +674,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -754,8 +738,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -819,8 +801,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -882,8 +862,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
@@ -951,8 +929,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-heat.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index a0cb121fc..2ba3a65b7 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -634,9 +634,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
         deploy_args += ['-e', os.path.join(
             tht_templates, "environments/disable-neutron.yaml")]
 
-    if not CONF.get('enable_heat'):
-        deploy_args += ['-e', os.path.join(
-            tht_templates, "environments/disable-heat.yaml")]
+    if CONF.get('enable_heat'):
+        LOG.warning('enable_heat has been deprecated. Ephemeral heat '
+                    'is now deployed by default. Please remove the '
+                    'option from undercloud.conf.')
 
     if CONF.get('ipa_otp'):
         deploy_args += ['-e', os.path.join(