diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 68de12b0e..7166298ff 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::heat::api (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::heat
+
   if $step >= 4 {
-    include ::tripleo::profile::base::heat
     include ::heat::api
   }
 }
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index 7c80fc606..c1adae680 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::heat::api_cfn (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::heat
+
   if $step >= 4 {
-    include ::tripleo::profile::base::heat
     include ::heat::api_cfn
   }
 }
diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp
index 636227542..3004db9a3 100644
--- a/manifests/profile/base/heat/api_cloudwatch.pp
+++ b/manifests/profile/base/heat/api_cloudwatch.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::heat::api_cloudwatch (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::heat
+
   if $step >= 4 {
-    include ::tripleo::profile::base::heat
     include ::heat::api_cloudwatch
   }
 }
diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp
index 32a711f31..112fad8db 100644
--- a/manifests/profile/base/heat/engine.pp
+++ b/manifests/profile/base/heat/engine.pp
@@ -37,12 +37,13 @@ class tripleo::profile::base::heat::engine (
     $sync_db = false
   }
 
+  include ::tripleo::profile::base::heat
+
   if $step >= 3 and $sync_db {
     include ::heat::db::mysql
   }
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::tripleo::profile::base::heat
     include ::heat::engine
   }