diff --git a/.gitmodules b/.gitmodules
index ce4f9e33a..43ea4ced9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,9 @@
 
 [submodule "ccs_config"]
         path = ccs_config
-        url = https://github.com/jedwards4b/ccs_config_cesm.git
+        url = https://github.com/ESMCI/ccs_config_cesm.git
         fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
-        fxtag = ccs_config_cesm1.0.10_update_default_ww3grid07
+        fxtag = ccs_config_cesm1.0.12
         fxrequired = ToplevelRequired
 
 [submodule "cime"]
@@ -101,7 +101,7 @@
         url = https://github.com/ESCOMP/CMEPS.git
         fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
         fxrequired = ToplevelRequired
-        fxtag = cmeps1.0.16
+        fxtag = cmeps1.0.25
 
 [submodule "rtm"]
         path = components/rtm
diff --git a/ccs_config b/ccs_config
index 3c30d1ca7..1ebe59402 160000
--- a/ccs_config
+++ b/ccs_config
@@ -1 +1 @@
-Subproject commit 3c30d1ca7d2a4bee7993532b5c3955fcd4409954
+Subproject commit 1ebe59402bc19881a6d711084e27bdbe6c69149c
diff --git a/components/cmeps b/components/cmeps
index 5b7d76978..959e9a0b1 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit 5b7d76978e2fdc661ec2de4ba9834b985decadc6
+Subproject commit 959e9a0b1aa3c602de4674f0553875efa8f6c1b6