diff --git a/.gitmodules b/.gitmodules
index 8b5b737335..8c62c7b780 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,8 +20,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS.git
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS.git
+  branch = feature/updcmeps
 [submodule "HYCOM"]
   path = HYCOM-interface/HYCOM
   url = https://github.com/NOAA-EMC/HYCOM-src
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
index 5beead0ff6..391ebabcb2 160000
--- a/CMEPS-interface/CMEPS
+++ b/CMEPS-interface/CMEPS
@@ -1 +1 @@
-Subproject commit 5beead0ff69de03c9f535efe0aca1f61cc47ec07
+Subproject commit 391ebabcb2b1287fd07881efbef68b5b7c9a7905
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
index a60d766e1e..60104f0dc5 100644
--- a/CMEPS-interface/CMakeLists.txt
+++ b/CMEPS-interface/CMakeLists.txt
@@ -19,16 +19,11 @@ else()
 endif()
 
 list(APPEND _nems_util_files
-  CMEPS/util/shr_abort_mod.F90
-  CMEPS/util/shr_log_mod.F90
-  CMEPS/util/shr_sys_mod.F90
-  CMEPS/util/shr_flux_mod.F90
-  CMEPS/util/shr_mpi_mod.F90
-  CMEPS/util/glc_elevclass_mod.F90
-  CMEPS/util/shr_mem_mod.F90
-  CMEPS/util/shr_kind_mod.F90
-  CMEPS/util/perf_mod.F90
-  CMEPS/util/shr_const_mod.F90)
+  CMEPS/ufs/flux_atmocn_mod.F90
+  CMEPS/ufs/glc_elevclass_mod.F90
+  CMEPS/ufs/ufs_kind_mod.F90
+  CMEPS/ufs/perf_mod.F90
+  CMEPS/ufs/ufs_const_mod.F90)
 
 list(APPEND _mediator_files
   CMEPS/mediator/med_phases_restart_mod.F90
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 62695f0483..eaeaaf47c2 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -1055,6 +1055,7 @@ export use_mommesh=true
 export RUNTYPE=startup
 export CICERUNTYPE=initial
 export eps_imesh=1.0e-1
+export ATMTILESIZE=`expr $NPX - 1`
 
 # FV3 defaults
 export FRAC_GRID=.true.
diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
index f7effb4cbb..0651821a37 100644
--- a/tests/parm/nems.configure.cpld.IN
+++ b/tests/parm/nems.configure.cpld.IN
@@ -86,6 +86,7 @@ MED_attributes::
       history_option = nhours
       history_ymd = -999
       coupling_mode = @[CPLMODE]
+      history_tile_atm = @[ATMTILESIZE]
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2
diff --git a/tests/parm/nems.configure.cpld_wave.IN b/tests/parm/nems.configure.cpld_wave.IN
index 29cf79aecd..acfe49097f 100644
--- a/tests/parm/nems.configure.cpld_wave.IN
+++ b/tests/parm/nems.configure.cpld_wave.IN
@@ -100,6 +100,7 @@ MED_attributes::
       history_option = nhours
       history_ymd = -999
       coupling_mode = @[CPLMODE]
+      history_tile_atm = @[ATMTILESIZE]
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2
diff --git a/tests/tests/cpld_bmark_mpi_p7 b/tests/tests/cpld_bmark_mpi_p7
index dfdbe333be..e5176ed746 100644
--- a/tests/tests/cpld_bmark_mpi_p7
+++ b/tests/tests/cpld_bmark_mpi_p7
@@ -83,6 +83,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25
diff --git a/tests/tests/cpld_bmark_p7 b/tests/tests/cpld_bmark_p7
index 44a6e34aaf..1e160f67ec 100644
--- a/tests/tests/cpld_bmark_p7
+++ b/tests/tests/cpld_bmark_p7
@@ -83,6 +83,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25
diff --git a/tests/tests/cpld_control_c192_p7 b/tests/tests/cpld_control_c192_p7
index c378dee3cc..a9572e2a63 100644
--- a/tests/tests/cpld_control_c192_p7
+++ b/tests/tests/cpld_control_c192_p7
@@ -79,6 +79,7 @@ export NPX=193
 export NPY=193
 export IMO=768
 export JMO=384
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=050
 export ICERES=0.50
diff --git a/tests/tests/cpld_control_c384_p7 b/tests/tests/cpld_control_c384_p7
index 784e9140c5..b94e22ed01 100644
--- a/tests/tests/cpld_control_c384_p7
+++ b/tests/tests/cpld_control_c384_p7
@@ -75,6 +75,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25
diff --git a/tests/tests/cpld_restart_c192_p7 b/tests/tests/cpld_restart_c192_p7
index 75165ef832..11398b16a1 100644
--- a/tests/tests/cpld_restart_c192_p7
+++ b/tests/tests/cpld_restart_c192_p7
@@ -83,6 +83,7 @@ export NPX=193
 export NPY=193
 export IMO=768
 export JMO=384
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=050
 export ICERES=0.50
diff --git a/tests/tests/cpld_restart_c384_p7 b/tests/tests/cpld_restart_c384_p7
index 206e50a980..6839c911ae 100644
--- a/tests/tests/cpld_restart_c384_p7
+++ b/tests/tests/cpld_restart_c384_p7
@@ -79,6 +79,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
+export ATMTILESIZE=`expr $NPX - 1`
 
 export OCNRES=025
 export ICERES=0.25