diff --git a/stack.sh b/stack.sh
index 9db1262..90e612c 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1889,15 +1889,6 @@
 fi
 
 
-# Heat
-# ----
-
-if is_service_enabled heat; then
-    echo_summary "Configuring Heat"
-    init_heat
-fi
-
-
 # Launch Services
 # ===============
 
@@ -2017,8 +2008,12 @@
 is_service_enabled swift3 || \
     screen_it n-obj "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-objectstore"
 
-# launch heat engine, api and metadata
+
+# Configure and launch heat engine, api and metadata
 if is_service_enabled heat; then
+    # Initialize heat, including replacing nova flavors
+    echo_summary "Configuring Heat"
+    init_heat
     echo_summary "Starting Heat"
     start_heat
 fi
@@ -2090,6 +2085,11 @@
     echo "Horizon is now available at http://$SERVICE_HOST/"
 fi
 
+# Warn that the default flavors have been changed by Heat
+if is_service_enabled heat; then
+    echo "Heat has replaced the default flavors. View by running: nova flavor-list"
+fi
+
 # If Keystone is present you can point ``nova`` cli to this server
 if is_service_enabled key; then
     echo "Keystone is serving at $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/"