diff --git a/.gitmodules b/.gitmodules
index dc0798c32..56dee3ba7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,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/NCAR/ccpp-physics
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 9fe0af3aa..35e9980d8 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 9fe0af3aadb3fca26d6bc684dfaa9d13ac8a533c
+Subproject commit 35e9980d8a6a6d8fe970cb286c4174b2b9bc4b6f
diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta
index b266544bc..4fbf96a5b 100644
--- a/scm/src/CCPP_typedefs.meta
+++ b/scm/src/CCPP_typedefs.meta
@@ -2758,7 +2758,7 @@
 [ccpp-table-properties]
   name = CCPP_typedefs
   type = module
-  relative_path = ../../ccpp/physics/physics
+  dependencies_path = ../../ccpp/physics/physics
   dependencies = hooks/machine.F,photochem/module_ozphys.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
 
diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
index bb171ab93..a451fafc2 100644
--- a/scm/src/GFS_typedefs.meta
+++ b/scm/src/GFS_typedefs.meta
@@ -10618,7 +10618,7 @@
 [ccpp-table-properties]
   name = GFS_typedefs
   type = module
-  relative_path = ../../ccpp/physics/physics
+  dependencies_path = ../../ccpp/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