diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup
index 5d6fbc01dd..a908555626 100755
--- a/bin/heat-keystone-setup
+++ b/bin/heat-keystone-setup
@@ -173,4 +173,6 @@ HEAT_CFN_SERVICE=$(get_service heat-cfn cloudformation \
                    "Heat CloudFormation API")
 add_endpoint $HEAT_CFN_SERVICE 'http://localhost:8000/v1'
 
-delete_service orchestration
+HEAT_OS_SERVICE=$(get_service heat orchestration \
+                  "Heat API")
+add_endpoint $HEAT_OS_SERVICE 'http://localhost:8004/v1/%(tenant_id)s'