diff --git a/.gitmodules b/.gitmodules
index 22c723ac1..c9a7fc74d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,10 @@
   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 = bugfix/unit_conv_invalid_allocation_prebuild
 [submodule "ccpp/physics"]
   path = ccpp/physics
   url = https://github.com/ufs-community/ccpp-physics
diff --git a/ccpp/framework b/ccpp/framework
index 0f8232724..8c8b60498 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 0f8232724975c13289cad390c9a71fa2c6a9bff4
+Subproject commit 8c8b60498ec463ea2d3d5b79950c6b47f4af3e34