diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
index eee5c0f3f..2c05bb9e3 100644
--- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -5,9 +5,6 @@
 # Docker namespace to use for Kolla images. Default is 'kolla'.
 kolla_docker_namespace: stackhpc-dev
 
-# Disable some services to reduce memory footprint.
-kolla_enable_heat: false
-
 ###############################################################################
 # StackHPC configuration.
 
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index ae77f5d90..4b42c9e17 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -15,6 +15,7 @@ kolla_enable_cloudkitty: true
 kolla_enable_designate: true
 kolla_enable_etcd: true
 kolla_enable_grafana: true
+kolla_enable_heat: true
 kolla_enable_influxdb: true
 kolla_enable_ironic: true
 kolla_enable_letsencrypt: true