diff --git a/build/deploy.edex.awips2/esb/bin/setup.env b/build/deploy.edex.awips2/esb/bin/setup.env
index b49c6aa985..9e7f9795ac 100644
--- a/build/deploy.edex.awips2/esb/bin/setup.env
+++ b/build/deploy.edex.awips2/esb/bin/setup.env
@@ -21,11 +21,10 @@ export BROKER_ADDR=${EDEX_SERVER}
 # these values are returned to clients that contact the localization service
 export HTTP_PORT=9581
 export HTTP_SERVER_PATH=/services
-export HTTP_SERVER=http://${BROKER_ADDR}:${HTTP_PORT}${HTTP_SERVER_PATH}
-export JMS_SERVER=tcp://${BROKER_ADDR}:5672
+export HTTP_SERVER=http://${EDEX_SERVER}:${HTTP_PORT}${HTTP_SERVER_PATH}
+export JMS_SERVER=tcp://${EDEX_SERVER}:5672
 export JMS_VIRTUALHOST=edex
-export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/api/latest/connection/${JMS_VIRTUALHOST}
-export RADAR_SERVER=tcp://${BROKER_ADDR}:8813
+export JMS_CONNECTIONS_URL=http://${EDEX_SERVER}:8180/api/latest/connection/${JMS_VIRTUALHOST}
 
 # data delivery config
 #export CLUSTER_ID=NCF