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 7d7c06640f..a0011cb402 160000
--- a/CMEPS-interface/CMEPS
+++ b/CMEPS-interface/CMEPS
@@ -1 +1 @@
-Subproject commit 7d7c06640fc5aff8fe2ed911716ba0c76521b059
+Subproject commit a0011cb4021b7b271145fa82f281c0b61da92add
diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
index 2019093325..7302fa0547 100644
--- a/tests/parm/nems.configure.cpld.IN
+++ b/tests/parm/nems.configure.cpld.IN
@@ -102,4 +102,7 @@ ALLCOMP_attributes::
       use_coldstart = @[use_coldstart]
       use_mommesh = @[use_mommesh]
       eps_imesh = @[eps_imesh]
+      stop_n = @[FHMAX]
+      stop_option = nhours
+      stop_ymd = -999
 ::
diff --git a/tests/parm/nems.configure.cpld_wave.IN b/tests/parm/nems.configure.cpld_wave.IN
index b0d2756b2b..56baf0b670 100644
--- a/tests/parm/nems.configure.cpld_wave.IN
+++ b/tests/parm/nems.configure.cpld_wave.IN
@@ -116,4 +116,7 @@ ALLCOMP_attributes::
       use_coldstart = @[use_coldstart]
       use_mommesh = @[use_mommesh]
       eps_imesh = @[eps_imesh]
+      stop_n = @[FHMAX]
+      stop_option = nhours
+      stop_ymd = -999
 ::
diff --git a/tests/parm/nems.configure.datm_cdeps.IN b/tests/parm/nems.configure.datm_cdeps.IN
index 6016ae628d..269deba8f1 100644
--- a/tests/parm/nems.configure.datm_cdeps.IN
+++ b/tests/parm/nems.configure.datm_cdeps.IN
@@ -122,4 +122,7 @@ ALLCOMP_attributes::
       orb_mode = fixed_year
       orb_mvelp = 1.e36
       orb_obliq = 1.e36
+      stop_n = @[FHMAX]
+      stop_option = nhours
+      stop_ymd = -999
 ::
diff --git a/tests/parm/nems.configure.hafs_atm_docn.IN b/tests/parm/nems.configure.hafs_atm_docn.IN
index 8c938677ff..f38fec7525 100644
--- a/tests/parm/nems.configure.hafs_atm_docn.IN
+++ b/tests/parm/nems.configure.hafs_atm_docn.IN
@@ -94,6 +94,9 @@ ALLCOMP_attributes::
   orb_obliq = 1.e36
   mediator_read_restart = @[USE_COLDSTART]
   mediator_present = true
+  stop_n = @[FHMAX]
+  stop_option = nhours
+  stop_ymd = -999
 ::
 
 ATM_modelio::
diff --git a/tests/parm/nems.configure.hafs_atm_ocn.IN b/tests/parm/nems.configure.hafs_atm_ocn.IN
index cbccc5679b..16d67c3d81 100644
--- a/tests/parm/nems.configure.hafs_atm_ocn.IN
+++ b/tests/parm/nems.configure.hafs_atm_ocn.IN
@@ -115,6 +115,9 @@ ALLCOMP_attributes::
   orb_obliq = 1.e36
   mediator_read_restart = @[USE_COLDSTART]
   mediator_present = true
+  stop_n = @[FHMAX]
+  stop_option = nhours
+  stop_ymd = -999
 ::
 
 ATM_modelio::