diff --git a/build/deploy.edex.awips2/esb/bin/setup.env b/build/deploy.edex.awips2/esb/bin/setup.env
index be05a8aacd..06305a670f 100644
--- a/build/deploy.edex.awips2/esb/bin/setup.env
+++ b/build/deploy.edex.awips2/esb/bin/setup.env
@@ -1,5 +1,5 @@
 ### EDEX localization related variables ###
-export AW_SITE_IDENTIFIER=BOU
+export AW_SITE_IDENTIFIER=OAX
 ## Cluster id can be set to the cluster's id (example:tbw for dx1-tbwo)
 ## it will be autogenerated if not set
 export CLUSTER_ID
diff --git a/build/deploy.edex.awips2/esb/etc/ingest.sh b/build/deploy.edex.awips2/esb/etc/ingest.sh
index d661e2ded6..7ed5cb4417 100644
--- a/build/deploy.edex.awips2/esb/etc/ingest.sh
+++ b/build/deploy.edex.awips2/esb/etc/ingest.sh
@@ -20,7 +20,7 @@
 ##
 
 export INIT_MEM=512 # in Meg
-export MAX_MEM=2560 # in Meg
+export MAX_MEM=4096 # in Meg
 
 export EDEX_DEBUG_PORT=5006
 export EDEX_JMX_PORT=1617
diff --git a/build/deploy.edex.awips2/esb/etc/ingestGrib.sh b/build/deploy.edex.awips2/esb/etc/ingestGrib.sh
index f7cbcf1bdd..999b0c7c6c 100644
--- a/build/deploy.edex.awips2/esb/etc/ingestGrib.sh
+++ b/build/deploy.edex.awips2/esb/etc/ingestGrib.sh
@@ -19,7 +19,7 @@
 # further licensing information.
 ##
 export INIT_MEM=1024 # in Meg
-export MAX_MEM=4096 # in Meg
+export MAX_MEM=8192 # in Meg
 
 export METADATA_POOL_MAX=16
 export EDEX_DEBUG_PORT=5007
diff --git a/build/deploy.edex.awips2/esb/etc/request.sh b/build/deploy.edex.awips2/esb/etc/request.sh
index d47ba64c5b..7c31a79230 100644
--- a/build/deploy.edex.awips2/esb/etc/request.sh
+++ b/build/deploy.edex.awips2/esb/etc/request.sh
@@ -19,12 +19,8 @@
 # further licensing information.
 ##
 export INIT_MEM=128 # in Meg
-if [ "$EDEX_ARCH" == "64-bit" ]; then
-    export MAX_MEM=4096 # in Meg
-else
-    export MAX_MEM=1376 # in Meg
-fi
-export SERIALIZE_POOL_MAX_SIZE=24
+export MAX_MEM=4096 # in Meg
+export SERIALIZE_POOL_MAX_SIZE=48
 export SERIALIZE_STREAM_INIT_SIZE_MB=2
 export SERIALIZE_STREAM_MAX_SIZE_MB=8
 
diff --git a/edexOsgi/build.edex/esb/bin/setup.env b/edexOsgi/build.edex/esb/bin/setup.env
index be05a8aacd..06305a670f 100644
--- a/edexOsgi/build.edex/esb/bin/setup.env
+++ b/edexOsgi/build.edex/esb/bin/setup.env
@@ -1,5 +1,5 @@
 ### EDEX localization related variables ###
-export AW_SITE_IDENTIFIER=BOU
+export AW_SITE_IDENTIFIER=OAX
 ## Cluster id can be set to the cluster's id (example:tbw for dx1-tbwo)
 ## it will be autogenerated if not set
 export CLUSTER_ID