diff --git a/manifests/heat/db.pp b/manifests/heat/db.pp
new file mode 100644
index 0000000..48739c1
--- /dev/null
+++ b/manifests/heat/db.pp
@@ -0,0 +1,5 @@
+class kickstack::heat::db inherits kickstack {
+
+  kickstack::db { 'heat': }
+
+}
diff --git a/manifests/node/api.pp b/manifests/node/api.pp
index 3d1e1c8..4714fd7 100644
--- a/manifests/node/api.pp
+++ b/manifests/node/api.pp
@@ -5,6 +5,7 @@ class kickstack::node::api inherits kickstack {
   $cinder_sql_conn = getvar("${fact_prefix}cinder_sql_connection")
   $neutron_sql_conn = getvar("${fact_prefix}neutron_sql_connection")
   $nova_sql_conn = getvar("${fact_prefix}nova_sql_connection")
+  $heat_sql_conn = getvar("${fact_prefix}heat_sql_connection")
   
 
   case $::kickstack::rpc {
diff --git a/manifests/node/infrastructure.pp b/manifests/node/infrastructure.pp
index 1e7d615..555870b 100644
--- a/manifests/node/infrastructure.pp
+++ b/manifests/node/infrastructure.pp
@@ -9,4 +9,8 @@ class kickstack::node::infrastructure inherits kickstack {
   include kickstack::neutron::db
   include kickstack::nova::db
 
+  if $::kickstack::heat_apis {
+    include kickstack::heat::db
+  }
+
 }