diff --git a/.gitmodules b/.gitmodules
index 0c3b70cc3f..9fb95a4d0d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/DeniseWorthen/fv3atm
+  branch = feature/testbs47
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
@@ -24,8 +26,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS.git
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS.git
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS.git
+  branch = feature/add_field_to_yaml_file
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
   url = https://github.com/NOAA-EMC/MOM6
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
index 0658dde477..2fe3412aaf 160000
--- a/CMEPS-interface/CMEPS
+++ b/CMEPS-interface/CMEPS
@@ -1 +1 @@
-Subproject commit 0658dde477b92348bc8608a8c1d20485843bf4a4
+Subproject commit 2fe3412aaf7515142403f7a92615d07cfa172b07
diff --git a/FV3 b/FV3
index 972d662f70..892bdc0a8e 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 972d662f7059b95993e9e3d314093d7306f70b63
+Subproject commit 892bdc0a8efc51251a5e8857d87702c370a6988d
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
index 2c64847b3e..b17446fdd1 100644
--- a/modulefiles/cheyenne.intel/fv3
+++ b/modulefiles/cheyenne.intel/fv3
@@ -31,7 +31,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/cheyenne.intel/fv3_debug b/modulefiles/cheyenne.intel/fv3_debug
index fd32e5ea27..79ed0b1e81 100644
--- a/modulefiles/cheyenne.intel/fv3_debug
+++ b/modulefiles/cheyenne.intel/fv3_debug
@@ -31,7 +31,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
+module load esmf/8_1_0_beta_snapshot_47-debug
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3
index 175b9702da..93d74d916d 100644
--- a/modulefiles/gaea.intel/fv3
+++ b/modulefiles/gaea.intel/fv3
@@ -33,7 +33,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/gaea.intel/fv3_debug b/modulefiles/gaea.intel/fv3_debug
index 74c180a7d5..521a230cb1 100644
--- a/modulefiles/gaea.intel/fv3_debug
+++ b/modulefiles/gaea.intel/fv3_debug
@@ -33,7 +33,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
+module load esmf/8_1_0_beta_snapshot_47-debug
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
index 7b20135794..c9f5e76e7f 100644
--- a/modulefiles/hera.intel/fv3
+++ b/modulefiles/hera.intel/fv3
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug
index dd65fa1b95..8ee2ef433c 100644
--- a/modulefiles/hera.intel/fv3_debug
+++ b/modulefiles/hera.intel/fv3_debug
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
+module load esmf/8_1_0_beta_snapshot_47-debug
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
index c94db9a4c0..99f0375ffd 100644
--- a/modulefiles/jet.intel/fv3
+++ b/modulefiles/jet.intel/fv3
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/jet.intel/fv3_debug b/modulefiles/jet.intel/fv3_debug
index c94db9a4c0..37dbf0c72c 100644
--- a/modulefiles/jet.intel/fv3_debug
+++ b/modulefiles/jet.intel/fv3_debug
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47-debug
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
index 55f9a7b721..e0a3c63993 100644
--- a/modulefiles/orion.intel/fv3
+++ b/modulefiles/orion.intel/fv3
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/orion.intel/fv3_debug
index 7f3e02d608..b7788646b1 100644
--- a/modulefiles/orion.intel/fv3_debug
+++ b/modulefiles/orion.intel/fv3_debug
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
+module load esmf/8_1_0_beta_snapshot_47-debug
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
index ef6fd67a9c..763b1c8c97 100644
--- a/modulefiles/wcoss_cray/fv3
+++ b/modulefiles/wcoss_cray/fv3
@@ -63,8 +63,8 @@ module load gni-headers
 module load udreg
 module load ugni
 
-module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module load esmf/8.1.0bs27
+module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0
+module load esmf/810bs47
 
 module swap pmi pmi/5.0.11
 
diff --git a/modulefiles/wcoss_cray/fv3_debug b/modulefiles/wcoss_cray/fv3_debug
index ef6fd67a9c..b2c9899d95 100644
--- a/modulefiles/wcoss_cray/fv3_debug
+++ b/modulefiles/wcoss_cray/fv3_debug
@@ -63,9 +63,8 @@ module load gni-headers
 module load udreg
 module load ugni
 
-module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module load esmf/8.1.0bs27
-
+module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0
+module load esmf/810bs47-debug
 module swap pmi pmi/5.0.11
 
 ##
diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
index a675477c49..99ee869b6c 100644
--- a/modulefiles/wcoss_dell_p3/fv3
+++ b/modulefiles/wcoss_dell_p3/fv3
@@ -30,7 +30,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 
 module load bacio/2.4.1
 module load crtm/2.3.0
diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/wcoss_dell_p3/fv3_debug
index 89b4a7ca85..defb188486 100644
--- a/modulefiles/wcoss_dell_p3/fv3_debug
+++ b/modulefiles/wcoss_dell_p3/fv3_debug
@@ -30,7 +30,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27-debug
+module load esmf/8_1_0_beta_snapshot_47-debug
 
 module load bacio/2.4.1
 module load crtm/2.3.0