diff --git a/.gitmodules b/.gitmodules
index a773677e6..5e5f8d221 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "ccpp/framework"]
   path = ccpp/framework
   url = https://github.com/NCAR/ccpp-framework
-  branch = main
+  branch = develop
 [submodule "ccpp/physics"]
   path = ccpp/physics
   url = https://github.com/ufs-community/ccpp-physics
diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta
index 809487b1d..5a328fccd 100644
--- a/ccpp/data/CCPP_typedefs.meta
+++ b/ccpp/data/CCPP_typedefs.meta
@@ -3230,7 +3230,7 @@
 [ccpp-table-properties]
   name = CCPP_typedefs
   type = module
-  relative_path = ../physics/physics
+  dependencies_path = ../physics/physics
   dependencies = hooks/machine.F,photochem/module_ozphys.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
 
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index 0b9ae7fe3..680536227 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -10413,7 +10413,7 @@
 [ccpp-table-properties]
   name = GFS_typedefs
   type = module
-  relative_path = ../physics/physics/
+  dependencies_path = ../physics/physics/
   dependencies = hooks/machine.F,hooks/physcons.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
   dependencies = MP/TEMPO/TEMPO/module_mp_tempo_params.F90
diff --git a/ccpp/data/MPAS_typedefs.meta b/ccpp/data/MPAS_typedefs.meta
index 21c41ebb1..fa785d843 100644
--- a/ccpp/data/MPAS_typedefs.meta
+++ b/ccpp/data/MPAS_typedefs.meta
@@ -2,7 +2,7 @@
 [ccpp-table-properties]
   name = MPAS_typedefs
   type = module
-  relative_path = ../physics/physics/
+  dependencies_path = ../physics/physics/
   dependencies = hooks/machine.F
 
 [ccpp-arg-table]
diff --git a/ccpp/framework b/ccpp/framework
index 3256121dc..22bc1a5de 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 3256121dc4972d5c78f43f1a16ea1cb118ec6daf
+Subproject commit 22bc1a5de8a19996310aedc3482931616cd74a1b
diff --git a/ccpp/physics b/ccpp/physics
index 7e9ddf0b6..92bd50183 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 7e9ddf0b6bb2ec6034049b05447e060115dd8de0
+Subproject commit 92bd501831f43d9248314aeae981b4a8494e387a