diff --git a/.gitmodules b/.gitmodules
index d253f6966..7ec609361 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 = master
+	#url = https://github.com/NCAR/ccpp-framework
+	#branch = master
+	url = https://github.com/climbfuji/ccpp-framework
+	branch = bugfixes_from_public_release
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = master
+	#url = https://github.com/NCAR/ccpp-physics
+	#branch = master
+	url = https://github.com/climbfuji/ccpp-physics
+	branch = bugfixes_from_public_release
diff --git a/ccpp/framework b/ccpp/framework
index 092c293cc..640afa4f2 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 092c293ccd615833b85740135d90007e19817095
+Subproject commit 640afa4f20c1831f168b90bf2a55f2174edae140
diff --git a/ccpp/physics b/ccpp/physics
index 25a72ecbf..6c1eec4f3 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 25a72ecbfdeac3d0fe56f73b2f545ac25628b309
+Subproject commit 6c1eec4f354d305bc8088ac883e9f133785a6514