diff --git a/ci/hera.sh b/ci/hera.sh
index 7aacf69ab..2a1bf3d17 100644
--- a/ci/hera.sh
+++ b/ci/hera.sh
@@ -1,4 +1,4 @@
-export GDAS_CI_ROOT=/scratch3/NCEPDEV/da/Russ.Treadon/CI/GDASApp
+export GDAS_CI_ROOT=/scratch3/NCEPDEV/da/$USER/CI/GDASApp
 export GDAS_CI_HOST='hera'
 export GDAS_MODULE_USE=$GDAS_CI_ROOT/repo/modulefiles
 export SLURM_ACCOUNT=da-cpu
diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi
index 0b66d7ee6..4b6ef1760 160000
--- a/sorc/fv3-jedi
+++ b/sorc/fv3-jedi
@@ -1 +1 @@
-Subproject commit 0b66d7ee674c97844773edfc41cef18d0881aa5b
+Subproject commit 4b6ef176064f18af602d7f90998e9020491738d3
diff --git a/sorc/ioda b/sorc/ioda
index 3a1b65488..43b7ffcaa 160000
--- a/sorc/ioda
+++ b/sorc/ioda
@@ -1 +1 @@
-Subproject commit 3a1b65488c7926e71a32a4fe03ac1b5ed48258fb
+Subproject commit 43b7ffcaa49152f162646f0a0c282b62ffc567c3
diff --git a/sorc/iodaconv b/sorc/iodaconv
index 812620293..764a2f9bd 160000
--- a/sorc/iodaconv
+++ b/sorc/iodaconv
@@ -1 +1 @@
-Subproject commit 8126202939f3917d9706d840b9e90a1b565bdd92
+Subproject commit 764a2f9bd1853e7ed4455ba23b7073017b0d05a7
diff --git a/sorc/oops b/sorc/oops
index 0fabc6e7a..1aede9ec3 160000
--- a/sorc/oops
+++ b/sorc/oops
@@ -1 +1 @@
-Subproject commit 0fabc6e7a3e3bec2aad7d39fdb84e8647ca35439
+Subproject commit 1aede9ec36fd32a3f46b0b8c2ca926ec47ed0b50
diff --git a/sorc/saber b/sorc/saber
index 276a8f387..7387b40bc 160000
--- a/sorc/saber
+++ b/sorc/saber
@@ -1 +1 @@
-Subproject commit 276a8f387d28945e76c49c1dbe14dd1f6a5ac07e
+Subproject commit 7387b40bc6067ee616fe087a527a1ac23430b087
diff --git a/sorc/soca b/sorc/soca
index 4e3661ec1..c7ba136c8 160000
--- a/sorc/soca
+++ b/sorc/soca
@@ -1 +1 @@
-Subproject commit 4e3661ec129390e4906a1f0c78e6ec7aa032df46
+Subproject commit c7ba136c8def5358e1d5e37275419154fcb55137
diff --git a/sorc/ufo b/sorc/ufo
index 81f219b65..498d2b328 160000
--- a/sorc/ufo
+++ b/sorc/ufo
@@ -1 +1 @@
-Subproject commit 81f219b656a7669a51bbc11d9d8c140ab8c6a0c7
+Subproject commit 498d2b32823a348f78592efe99fa2a21e8ba51aa
diff --git a/sorc/vader b/sorc/vader
index 2d935a5d5..0d476c79c 160000
--- a/sorc/vader
+++ b/sorc/vader
@@ -1 +1 @@
-Subproject commit 2d935a5d54ccfd4ac433d54bb62a2fe1eb578193
+Subproject commit 0d476c79cfc9e3d383de26169a59245d034bc239
diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh
index 3dfcf6420..c9cf1cbf2 100755
--- a/test/atm/global-workflow/jjob_ens_init.sh
+++ b/test/atm/global-workflow/jjob_ens_init.sh
@@ -95,7 +95,7 @@ for imem in $(seq 1 $NMEM_ENS); do
 
     source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
     target=$COMIN_ATMOS_HISTORY_PREV_ENS
-    flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
+    flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
     for file in "${flist[@]}"; do
 	rm -rf $target/enkf${gprefix}.${file}
         ln -fs $source/enkf${gprefix}.${file} $target/
diff --git a/test/atm/global-workflow/jjob_ens_init_split.sh b/test/atm/global-workflow/jjob_ens_init_split.sh
index d4f1ccd2f..3eb4260e8 100755
--- a/test/atm/global-workflow/jjob_ens_init_split.sh
+++ b/test/atm/global-workflow/jjob_ens_init_split.sh
@@ -98,7 +98,7 @@ for imem in $(seq 1 $NMEM_ENS); do
 
     source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
     target=$COMIN_ATMOS_HISTORY_PREV_ENS
-    flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
+    flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
     for file in "${flist[@]}"; do
 	rm -rf $target/enkf${gprefix}.${file}
         ln -fs $source/enkf${gprefix}.${file} $target/enkf${gprefix}.${file}
diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh
index 061e9a746..4c1032b18 100755
--- a/test/atm/global-workflow/jjob_var_init.sh
+++ b/test/atm/global-workflow/jjob_var_init.sh
@@ -87,7 +87,7 @@ for file in $flist; do
 done
 
 # Link atmospheric histories on native cubed-sphere grid
-flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
+flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
 for file in "${flist[@]}"; do
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${gprefix}.${file} $COMIN_ATMOS_HISTORY_PREV/${gprefix}.${file}
 done
@@ -108,7 +108,7 @@ for imem in $(seq 1 $NMEM_ENS); do
 
     source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
     target=$COMIN_ATMOS_HISTORY_PREV_ENS
-    flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
+    flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
     for file in "${flist[@]}"; do
         rm -rf $target/enkf${gprefix}.${file}
         ln -fs $source/enkf${gprefix}.${file} $target/