diff --git a/stack.sh b/stack.sh
index 1cd1e1a..4d76949 100755
--- a/stack.sh
+++ b/stack.sh
@@ -852,6 +852,7 @@
 fi
 if is_service_enabled heat; then
     install_heat
+    install_heatclient
 fi
 if is_service_enabled cinder; then
     install_cinder
@@ -906,6 +907,7 @@
 fi
 if is_service_enabled heat; then
     configure_heat
+    configure_heatclient
 fi
 if is_service_enabled cinder; then
     configure_cinder