diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2
index 599f39d1abf0b529eacb1410c3a1c88e3869acdc..c3376987552a6b955ffee583c4a87e3b7c9f7178 100644
--- a/playbooks/kayobe-overcloud-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2
@@ -33,6 +33,11 @@ compute_libvirt_sasl_password: "{% raw %}{{ lookup('password', '/tmp/libvirt-sas
 # Enable ironic for testing baremetal compute.
 kolla_enable_ironic: true
 
+# extra RAM usage is causing the OOM killer to terminate
+# Tenks VMs. Disable Heat and Horizon to free up enough memory.
+kolla_enable_heat: false
+kolla_enable_horizon: false
+
 {% if tls_enabled %}
 kolla_enable_nova_libvirt_container: false
 compute_libvirt_enable_tls: true
@@ -42,11 +47,6 @@ kolla_enable_tls_internal: "yes"
 
 kolla_ironic_pxe_append_params_extra:
   - ipa-insecure=1
-
-# When TLS is enabled, extra RAM usage is causing the OOM killer to terminate
-# Tenks VMs. Disable Heat and Horizon to free up enough memory.
-kolla_enable_heat: false
-kolla_enable_horizon: false
 {% endif %}
 
 # NOTE(bbezak): Kolla does not build CentOS Stream 9 container images.