diff --git a/.gitmodules b/.gitmodules
index afe6f27dd..c388e8b01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,13 @@
 	branch = dev/emc
 [submodule "ccpp/framework"]
 	path = ccpp/framework
-	url = https://github.com/NCAR/ccpp-framework
-	branch = main
+	#url = https://github.com/NCAR/ccpp-framework
+	#branch = main
+	url = https://github.com/climbfuji/ccpp-framework
+	branch = thompson_subcycling_for_main
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = main
+	#url = https://github.com/NCAR/ccpp-physics
+	#branch = main
+	url = https://github.com/climbfuji/ccpp-physics
+	branch = thompson_subcycling_for_main
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cecbf2d0..747a2e028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 ###############################################################################
 ### CCPP
 ###############################################################################
diff --git a/ccpp/framework b/ccpp/framework
index 54b158f91..7e90b4144 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 54b158f91fb0abf58ab099d4ae80a57d7f1ee0b8
+Subproject commit 7e90b4144d50e789ab58a753edeaf3426cf301c4
diff --git a/ccpp/physics b/ccpp/physics
index 24cc09ed0..ded5d361a 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 24cc09ed037c80659992cd3a9ef0900ed2d76785
+Subproject commit ded5d361a0f332cc54c7621c08cd73759672866d
diff --git a/ccpp/suites/suite_FV3_GFS_v16_thompson.xml b/ccpp/suites/suite_FV3_GFS_v16_thompson.xml
index 9d02b3f35..3ae7a91d3 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_thompson.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_thompson.xml
@@ -76,7 +76,11 @@
       <scheme>cnvc90</scheme>
       <scheme>GFS_MP_generic_pre</scheme>
       <scheme>mp_thompson_pre</scheme>
+    </subcycle>
+    <subcycle loop="2">
       <scheme>mp_thompson</scheme>
+    </subcycle>
+    <subcycle loop="1">
       <scheme>mp_thompson_post</scheme>
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>maximum_hourly_diagnostics</scheme>
diff --git a/ccpp/suites/suite_FV3_GSD_noah.xml b/ccpp/suites/suite_FV3_GSD_noah.xml
index 2c7412221..732875d11 100644
--- a/ccpp/suites/suite_FV3_GSD_noah.xml
+++ b/ccpp/suites/suite_FV3_GSD_noah.xml
@@ -76,7 +76,11 @@
       <scheme>cnvc90</scheme>
       <scheme>GFS_MP_generic_pre</scheme>
       <scheme>mp_thompson_pre</scheme>
+    </subcycle>
+    <subcycle loop="4">
       <scheme>mp_thompson</scheme>
+    </subcycle>
+    <subcycle loop="1">
       <scheme>mp_thompson_post</scheme>
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>cu_gf_driver_post</scheme>
diff --git a/ccpp/suites/suite_FV3_GSD_v0.xml b/ccpp/suites/suite_FV3_GSD_v0.xml
index b73a9840e..16d203bc3 100644
--- a/ccpp/suites/suite_FV3_GSD_v0.xml
+++ b/ccpp/suites/suite_FV3_GSD_v0.xml
@@ -75,7 +75,11 @@
       <scheme>cnvc90</scheme>
       <scheme>GFS_MP_generic_pre</scheme>
       <scheme>mp_thompson_pre</scheme>
+    </subcycle>
+    <subcycle loop="1">
       <scheme>mp_thompson</scheme>
+    </subcycle>
+    <subcycle loop="1">
       <scheme>mp_thompson_post</scheme>
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>cu_gf_driver_post</scheme>