diff --git a/.gitmodules b/.gitmodules
index 8ce51cd4..6bb16a2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "ccpp-framework"]
         path          = ccpp_framework
         url           = https://github.com/NCAR/ccpp-framework
-        fxtag         = 2025-10-15-dev
+        fxtag         = sima_2026-01-20
         fxrequired    = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework
 [submodule "history"]
@@ -20,7 +20,7 @@
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
 	url           = https://github.com/ESCOMP/atmospheric_physics
-	fxtag         = atmos_phys0_21_000
+	fxtag         = 87e76a6ce90767d1d32259ff3f11dec9c9a03b03
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "rrtmgp-data"]
diff --git a/ccpp_framework b/ccpp_framework
index 37db3485..3889050e 160000
--- a/ccpp_framework
+++ b/ccpp_framework
@@ -1 +1 @@
-Subproject commit 37db3485e1f71a2556df78c6636a96ed0ce137bc
+Subproject commit 3889050e5e67ffe9db4f9ebc08872fd84406c837
diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90
index febecdea..0930ff75 100644
--- a/src/control/cam_comp.F90
+++ b/src/control/cam_comp.F90
@@ -657,6 +657,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
               default_value=0._kind_phys,                                               &
               vertical_dim="vertical_layer_dimension",                                  &
               advected=.true.,                                                          &
+              diag_name="Q",                                                            &
            errcode=errflg, errmsg=errmsg)
 
          if (errflg /= 0) then
diff --git a/src/data/generate_registry_data.py b/src/data/generate_registry_data.py
index 2ddcf152..b8e02252 100755
--- a/src/data/generate_registry_data.py
+++ b/src/data/generate_registry_data.py
@@ -1863,8 +1863,7 @@ def gen_registry(registry_file, dycore, outdir, indent,
     try:
         emsg = f"Invalid registry file, {registry_file}"
         file_ok = validate_xml_file(registry_file, 'registry', version,
-                                    logger, schema_path=schema_dir,
-                                    error_on_noxmllint=error_on_no_validate)
+                                    logger, schema_path=schema_dir)
     except CCPPError as ccpperr:
         emsg += f"\n{ccpperr}"
         file_ok = False
diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp
index b3abf21d..87e76a6c 160000
--- a/src/physics/ncar_ccpp
+++ b/src/physics/ncar_ccpp
@@ -1 +1 @@
-Subproject commit b3abf21d92b101a899dec719c436e0cc046f1251
+Subproject commit 87e76a6ce90767d1d32259ff3f11dec9c9a03b03
diff --git a/test/existing-test-failures.txt b/test/existing-test-failures.txt
index 1fb43278..7788416b 100644
--- a/test/existing-test-failures.txt
+++ b/test/existing-test-failures.txt
@@ -1,2 +1,5 @@
 SMS_Ln9.ne3pg3_ne3pg3_mg37.FKESSLER.derecho_intel.cam-outfrq_se_cslam_multitape
   - known NLFAIL due to cime validation error on multiple history tapes (#430)
+
+SMS_Ln9.ne3pg3_ne3pg3_mg37.FADIAB.derecho_gnu.cam-outfrq_se_cslam
+  - known FAIL on shr_reprosum_calc call from src/dynamics/se/dycore/global_norms_mod.F90
diff --git a/test/unit/python/test_registry.py b/test/unit/python/test_registry.py
index 4f1147cf..d166c367 100644
--- a/test/unit/python/test_registry.py
+++ b/test/unit/python/test_registry.py
@@ -133,8 +133,8 @@ def test_bad_registry_xml(self):
         # end with
         expected_error = "reg_bad_xml.xml:32: element ic_file_input_name: Schemas validity error : Element 'ic_file_input_name': This element is not expected. Expected is one of ( initial_value, ic_file_input_names )."
         split_exception = str(cerr.exception).split('\n')
-        amsg = f"Test failure: exception raised is {len(split_exception)} lines long and is expected to be 4"
-        self.assertEqual(len(split_exception), 4, msg=amsg)
+        amsg = f"Test failure: exception raised is {len(split_exception)} lines long and is expected to be 5"
+        self.assertEqual(len(split_exception), 5, msg=amsg)
         # Check that the full xmllint message was returned
         self.assertTrue(split_exception[2].endswith(expected_error))