diff --git a/edexOsgi/build.edex/esb/bin/setup.env b/edexOsgi/build.edex/esb/bin/setup.env
index 3d76c08938..a3f3e4c5f1 100644
--- a/edexOsgi/build.edex/esb/bin/setup.env
+++ b/edexOsgi/build.edex/esb/bin/setup.env
@@ -23,6 +23,8 @@ export DB_PORT=5432
 
 # setup connection to qpid
 export BROKER_ADDR=localhost
+export BROKER_PORT=5672
+export BROKER_HTTP=8180
 
 # setup hdf5 connection if pypies is enabled
 export PYPIES_SERVER=http://localhost:9582
@@ -32,9 +34,9 @@ export PYPIES_SERVER=http://localhost:9582
 export HTTP_PORT=9581
 export HTTP_SERVER_PATH=/services
 export HTTP_SERVER=http://localhost:${HTTP_PORT}${HTTP_SERVER_PATH}
-export JMS_SERVER=tcp://${BROKER_ADDR}:5672
+export JMS_SERVER=tcp://${BROKER_ADDR}:${BROKER_PORT}
 export JMS_VIRTUALHOST=edex
-export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/api/v2/connection/${JMS_VIRTUALHOST}
+export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:${BROKER_HTTP}/api/v2/connection/${JMS_VIRTUALHOST}
 export RADAR_SERVER=tcp://localhost:8813
 
 # set the AWIPS II shared directory
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index 1ab4339a3d..28e52c27c7 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -14,7 +14,7 @@
     <!-- specify the connection to the broker (qpid) -->
     <!-- MaxPrefetch set at 0, due to DataPool routers getting messages backed up behind long running tasks -->
     <bean id="amqConnectionFactory" class="org.apache.qpid.client.AMQConnectionFactory">
-       <constructor-arg type="java.lang.String" value="amqp://guest:guest@/${JMS_VIRTUALHOST}?brokerlist='tcp://${BROKER_ADDR}?retries='9999'&amp;heartbeat='0'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
+       <constructor-arg type="java.lang.String" value="amqp://guest:guest@/${JMS_VIRTUALHOST}?brokerlist='${JMS_SERVER}?retries='9999'&amp;heartbeat='0'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
     </bean>
 
     <bean id="jmsPooledConnectionFactory" class="com.raytheon.uf.common.jms.JmsPooledConnectionFactory">
diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
index 0f2bc1a932..a4088fc87f 100644
--- a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
+++ b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
@@ -197,9 +197,9 @@ public class Wes2BridgeManager {
 
             final String line1 = "export DATA_ARCHIVE_ROOT=";
             final String line2 = "export DB_PORT=";
-            final String line3 = "export BROKER_ADDR=";
+            final String line3 = "export BROKER_PORT=";
             final String line4 = "export HTTP_PORT=";
-            final String line5 = "export JMS_SERVER=";
+            final String line5 = "export BROKER_HTTP=";
             final String line6 = "export SHARE_DIR=";
             final String pypiesServerPattern = "(export PYPIES_SERVER=http://.+:)[1-9][0-9]+";
             final Pattern pattern7 = Pattern.compile(pypiesServerPattern);
@@ -213,13 +213,11 @@ public class Wes2BridgeManager {
                 } else if (line.startsWith(line2)) {
                     line = line2 + this.wes2BridgeCase.getDatabasePort();
                 } else if (line.startsWith(line3)) {
-                    line = line3 + "localhost:"
-                            + this.wes2BridgeCase.getJmsPort();
+                    line = line3 + this.wes2BridgeCase.getJmsPort();
                 } else if (line.startsWith(line4)) {
                     line = line4 + this.wes2BridgeCase.getEdexHttpPort();
                 } else if (line.startsWith(line5)) {
-                    line = line5 + "tcp://localhost:"
-                            + this.wes2BridgeCase.getJmsPort();
+                    line = line5 + this.wes2BridgeCase.getQpidHttpPort();
                 } else if (line.startsWith(line6)) {
                     line = line6 + edexDirectory + "/data/share";
                 } else if (matcher.matches()) {