diff --git a/lib/heat b/lib/heat
index 0307c64ae1..b9b8aa66ca 100644
--- a/lib/heat
+++ b/lib/heat
@@ -60,13 +60,13 @@ function configure_heat() {
     # remove old config files
     rm -f $HEAT_CONF_DIR/heat-*.conf
 
-    HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST}
+    HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$HOST_IP}
     HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
     HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST}
     HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001}
-    HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST}
+    HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$HOST_IP}
     HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003}
-    HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST}
+    HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
     HEAT_API_PORT=${HEAT_API_PORT:-8004}
     HEAT_API_PASTE_FILE=$HEAT_CONF_DIR/api-paste.ini
     HEAT_POLICY_FILE=$HEAT_CONF_DIR/policy.json