diff --git a/Externals.cfg b/Externals.cfg
index c18747a3dd..808874ad45 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -8,7 +8,7 @@ protocol = git
 required = True
 
 [GSI]
-tag = gfsda.v16.2.0
+tag = gfsda.v16.3.0
 local_path = sorc/gsi.fd
 repo_url = https://github.com/NOAA-EMC/GSI.git
 protocol = git
diff --git a/ecf/versions/obsproc.ver b/ecf/versions/obsproc.ver
index c4acaa050f..cc53d8b7c8 100644
--- a/ecf/versions/obsproc.ver
+++ b/ecf/versions/obsproc.ver
@@ -1,5 +1,5 @@
-export gfs_ver="v16.2"
-export obsproc_ver="1.0.2"
+export gfs_ver="v16.3"
+export obsproc_ver="1.1.0"
 export envvars_ver="1.0"
 export PrgEnv_intel_ver=8.1.0
 export intel_ver=19.1.3.304
@@ -28,4 +28,4 @@ export PROCESS_MASTER_SHIP_STNLST=NO             # turn off the ship/names/stn_l
 export PATH=$PATH:.
 export BACK=off
 
-export HOMEobsproc="/lfs/h2/emc/global/save/emc.global/git/obsproc/v${obsproc_ver}"
+export HOMEobsproc="/lfs/h1/ops/prod/packages/obsproc.v${obsproc_ver}"
diff --git a/env/HERA.env b/env/HERA.env
index 421e644674..634392bb59 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -229,4 +229,9 @@ elif [ $step = "awips" ]; then
 elif [ $step = "gempak" ]; then
 
      echo "WARNING: $step is not enabled on $machine!"
+
+elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then
+
+    export USE_CFP=${USE_CFP:-"YES"}
+
 fi
diff --git a/env/ORION.env b/env/ORION.env
index aa710d7918..ed274c8d3f 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -230,4 +230,9 @@ elif [ $step = "awips" ]; then
 elif [ $step = "gempak" ]; then
 
      echo "WARNING: $step is not enabled on $machine!"
+
+elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then
+
+    export USE_CFP=${USE_CFP:-"YES"}
+
 fi
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index 2a15386a87..86d211bcd3 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -203,4 +203,8 @@ elif [ $step = "waveawipsbulls" ]; then
 
     unset PERL5LIB
 
+elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then
+
+    export USE_CFP=${USE_CFP:-"YES"}
+
 fi
diff --git a/jobs/rocoto/wafsgrib2.sh b/jobs/rocoto/wafsgrib2.sh
index 2fd4899da0..4b143e8bd8 100755
--- a/jobs/rocoto/wafsgrib2.sh
+++ b/jobs/rocoto/wafsgrib2.sh
@@ -16,6 +16,13 @@ for config in $configs; do
     [[ $status -ne 0 ]] && exit $status
 done
 
+##########################################
+# Source machine runtime environment
+##########################################
+. $HOMEgfs/env/${machine}.env wafsgrib2
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
 ###############################################################
 
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgrib2"
diff --git a/jobs/rocoto/wafsgrib20p25.sh b/jobs/rocoto/wafsgrib20p25.sh
index 8a1847881c..70f04802cd 100755
--- a/jobs/rocoto/wafsgrib20p25.sh
+++ b/jobs/rocoto/wafsgrib20p25.sh
@@ -16,6 +16,13 @@ for config in $configs; do
     [[ $status -ne 0 ]] && exit $status
 done
 
+##########################################
+# Source machine runtime environment
+##########################################
+. $HOMEgfs/env/${machine}.env wafsgrib20p25
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
 ###############################################################
 
 export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgrib20p25"
diff --git a/parm/config/config.resources.emc.dyn b/parm/config/config.resources.emc.dyn
index b3ecd54a0a..2df32bdbfc 100755
--- a/parm/config/config.resources.emc.dyn
+++ b/parm/config/config.resources.emc.dyn
@@ -65,7 +65,7 @@ elif [ $step = "waveprep" ]; then
     export npe_node_waveprep=$npe_waveprep
     export npe_node_waveprep_gfs=$npe_waveprep_gfs
     export memory_waveprep="100GB"
-    export memory_waveprep_gfs="200GB"
+    export memory_waveprep_gfs="220GB"
     export NTASKS=$npe_waveprep
     export NTASKS_gfs=$npe_waveprep_gfs
 
@@ -128,6 +128,7 @@ elif [ $step = "waveawipsgridded" ]; then
     export nth_waveawipsgridded=1
     export npe_node_waveawipsgridded=$(echo "$npe_node_max / $nth_waveawipsgridded" | bc)
     export NTASKS=$npe_waveawipsgridded
+    export memory_waveawipsgridded_gfs="2GB"
 
 elif [ $step = "anal" ]; then
 
@@ -334,7 +335,7 @@ elif [ $step = "ediag" ]; then
     export npe_ediag=48
     export nth_ediag=1
     export npe_node_ediag=$npe_node_max
-    export memory_ediag="24GB"
+    export memory_ediag="28GB"
 
 elif [ $step = "eupd" ]; then
 
diff --git a/parm/config/config.resources.nco.static b/parm/config/config.resources.nco.static
index 2bac17ec0d..fbf3d41d47 100755
--- a/parm/config/config.resources.nco.static
+++ b/parm/config/config.resources.nco.static
@@ -49,7 +49,7 @@ elif [ $step = "waveprep" ]; then
     export npe_node_waveprep=$npe_waveprep
     export npe_node_waveprep_gfs=$npe_waveprep_gfs
     export memory_waveprep="100GB"
-    export memory_waveprep_gfs="200GB"
+    export memory_waveprep_gfs="220GB"
     export NTASKS=$npe_waveprep
     export NTASKS_gfs=$npe_waveprep_gfs
 
@@ -112,6 +112,7 @@ elif [ $step = "waveawipsgridded" ]; then
     export nth_waveawipsgridded=1
     export npe_node_waveawipsgridded=$(echo "$npe_node_max / $nth_waveawipsgridded" | bc)
     export NTASKS=$npe_waveawipsgridded
+    export memory_waveawipsgridded_gfs="2GB"
 
 elif [ $step = "anal" ]; then
 
@@ -273,7 +274,7 @@ elif [ $step = "ediag" ]; then
     export npe_ediag=48
     export nth_ediag=1
     export npe_node_ediag=$npe_node_max
-    export memory_ediag="24GB"
+    export memory_ediag="28GB"
 
 elif [ $step = "eupd" ]; then
 
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index c45d781dc2..d84877d25b 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -35,7 +35,7 @@ fi
 echo gsi checkout ...
 if [[ ! -d gsi.fd ]] ; then
     rm -f ${topdir}/checkout-gsi.log
-    git clone --recursive --branch release/gfsda.v16.3.0 https://github.com/NOAA-EMC/GSI.git gsi.fd >> ${topdir}/checkout-gsi.log 2>&1
+    git clone --recursive --branch gfsda.v16.3.0 https://github.com/NOAA-EMC/GSI.git gsi.fd >> ${topdir}/checkout-gsi.log 2>&1
     cd gsi.fd
     git submodule update --init
     cd ${topdir}
diff --git a/versions/build.ver b/versions/build.ver
index bc378a0b59..b3a175b502 100755
--- a/versions/build.ver
+++ b/versions/build.ver
@@ -15,7 +15,7 @@ export netcdf_ver=4.7.4
 export esmf_ver=8.0.1
 export wgrib2_ver=2.0.7
 
-export crtm_ver=2.3.0
+export crtm_ver=2.4.0
 
 export g2tmpl_ver=1.9.1
 export bacio_ver=2.4.1
diff --git a/versions/hera.ver b/versions/hera.ver
index 8f2b36e95e..6a778c9106 100644
--- a/versions/hera.ver
+++ b/versions/hera.ver
@@ -2,7 +2,7 @@ export hpc_ver=1.2.0
 export hpc_intel_ver=18.0.5.274
 export hpc_impi_ver=2018.0.4
 
-export obsproc_run_ver=1.0.2
+export obsproc_run_ver=1.1.0
 export prepobs_run_ver=1.0.1
 
 export hpss_ver=hpss
diff --git a/versions/orion.ver b/versions/orion.ver
index 2a4bb81296..8261cc24c0 100644
--- a/versions/orion.ver
+++ b/versions/orion.ver
@@ -2,7 +2,7 @@ export hpc_ver=1.2.0
 export hpc_intel_ver=2018.4
 export hpc_impi_ver=2018.4
 
-export obsproc_run_ver=1.0.2
+export obsproc_run_ver=1.1.0
 export prepobs_run_ver=1.0.1
 
 export prod_util_ver=1.2.2
diff --git a/versions/run.ver b/versions/run.ver
index 4b3a3f9389..b7e6af45ab 100755
--- a/versions/run.ver
+++ b/versions/run.ver
@@ -5,7 +5,7 @@ export ecmwf_ver=v2.1
 export nam_ver=v4.2
 export rtofs_ver=v2.3
 export radarl2_ver=v1.2
-export obsproc_ver=v1.0
+export obsproc_ver=v1.1
 
 export PrgEnv_intel_ver=8.1.0
 export intel_ver=19.1.3.304
@@ -35,7 +35,7 @@ export util_shared_ver=1.4.0
 export grib_util_ver=1.2.3
 export wgrib2_ver=2.0.7
 
-export crtm_ver=2.3.0
+export crtm_ver=2.4.0
 
 export g2tmpl_ver=1.9.1
 export bacio_ver=2.4.1
diff --git a/versions/wcoss2.ver b/versions/wcoss2.ver
index 2caf72f53a..f4a5491063 100644
--- a/versions/wcoss2.ver
+++ b/versions/wcoss2.ver
@@ -2,7 +2,7 @@ export envvar_ver=1.0
 export prod_envir_ver=${prod_envir_ver:-2.0.4} # Allow override from ops ecflow
 export prod_util_ver=${prod_util_ver:-2.0.9}   # Allow override from ops ecflow
 
-export obsproc_run_ver=1.0.2
+export obsproc_run_ver=1.1.0
 export prepobs_run_ver=1.0.1
 
 export tracker_ver=v1.1.15.5