diff --git a/.gitmodules b/.gitmodules
index e88d5144c..1521db379 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,16 @@
 [submodule "atmos_cubed_sphere"]
 	path = atmos_cubed_sphere
-	url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
-	branch = ufs-release/public-v2
+	#url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
+	#branch = ufs-release/public-v2
+	url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere
+	branch = merge_hwrf_updates_into_release_public_v2
 [submodule "ccpp/framework"]
 	path = ccpp/framework
 	url = https://github.com/NCAR/ccpp-framework
 	branch = release/public-v5
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	url =  https://github.com/NCAR/ccpp-physics
-	branch = release/public-v5
+	#url =  https://github.com/NCAR/ccpp-physics
+	#branch = release/public-v5
+	url =  https://github.com/climbfuji/ccpp-physics
+	branch = bugfix_mp_thompson
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
index 27cc6ab4e..baca8de63 160000
--- a/atmos_cubed_sphere
+++ b/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit 27cc6ab4e46a3381be77edb1c0fbb4561334b1cc
+Subproject commit baca8de63466e89b77f6cf550650e87adcaeefa0
diff --git a/ccpp/physics b/ccpp/physics
index 0db75636f..3ae6ebd09 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 0db75636f26c51b23b97c75c0a515885219bd24d
+Subproject commit 3ae6ebd0988833d5ae3533578a2bcda903faf07f