diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
index 039f98b33a..c04057d5b1 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
@@ -24,9 +24,9 @@ ebxml.registry.webserver.port=8082
 # ebxml thrift service port
 ebxml.thrift.service.port=9588
 # EBXML registry host
-ebxml.registry.host=external
+ebxml.registry.host=external.fqdn
 # NCF HOST
-ncf.host=external
+ncf.host=external.fqdn
 # EBXML federation enable flag
 ebxml.registry.federation.enabled=false
 # EBXML registry webserver home
diff --git a/edexOsgi/deploy.edex.awips2/esb/bin/setup.env b/edexOsgi/deploy.edex.awips2/esb/bin/setup.env
index 02a6289e14..ee1bf10d58 100644
--- a/edexOsgi/deploy.edex.awips2/esb/bin/setup.env
+++ b/edexOsgi/deploy.edex.awips2/esb/bin/setup.env
@@ -1,6 +1,6 @@
 ### EDEX localization related variables ###
 export AW_SITE_IDENTIFIER=OAX
-export EXT_ADDR=external
+export EXT_ADDR=external.fqdn
 
 # database names
 export DC_DB_NAME=dc_ob7oax
diff --git a/rpms/awips2.upc/Installer.awips/programs/edex b/rpms/awips2.upc/Installer.awips/programs/edex
index a3614a8003..bf17ecf36b 100755
--- a/rpms/awips2.upc/Installer.awips/programs/edex
+++ b/rpms/awips2.upc/Installer.awips/programs/edex
@@ -224,11 +224,11 @@ edex_log() { # display todays log, default to ingest
 
 # See /awips2/edex/bin/setup.env
 edit_setup() {
-   sed -i.setup_$YMD 's/external/'$HOSTNAME'/g' $EDEX_ENV_FILE
+   sed -i.setup_$YMD 's/external.fqdn/'$HOSTNAME'/g' $EDEX_ENV_FILE
    echo '[edit] '$HOSTNAME' added to '$EDEX_ENV_FILE
    echo '       File backed up to '$EDEX_ENV_FILE'.setup_'$YMD
    # registry/data delivery fqdn
-   sed -i 's/external/'$HOSTNAME'/g' /awips2/edex/conf/resources/*
+   sed -i 's/external.fqdn/'$HOSTNAME'/g' /awips2/edex/conf/resources/*.properties
 }
 
 edex_edits() {