diff --git a/contrail_provisioning/openstack/scripts/heat-server-setup.sh b/contrail_provisioning/openstack/scripts/heat-server-setup.sh
index 5a332277..819d9eb9 100755
--- a/contrail_provisioning/openstack/scripts/heat-server-setup.sh
+++ b/contrail_provisioning/openstack/scripts/heat-server-setup.sh
@@ -135,6 +135,7 @@ for svc in heat; do
         openstack-config --set /etc/$svc/$svc.conf clients_contrail api_server $CONTRAIL_INTERNAL_VIP
     fi
     openstack-config --set /etc/$svc/$svc.conf clients_contrail api_base_url /
+    openstack-config --set /etc/$svc/$svc.conf clients_contrail auth_host_ip $controller_ip
 done
 
 for APP in heat; do