diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D63.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D63.xml
index ad840cbdb7fc7..b88c5d62626fa 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D63.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D63.xml
@@ -7,10 +7,14 @@
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml'/>
@@ -18,11 +22,7 @@
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml
index d0d3303cad858..015e9846b0508 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml
@@ -7,10 +7,14 @@
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml'/>
@@ -18,11 +22,7 @@
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml
index 4464335c0db07..8d7d3cea97979 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml
@@ -7,10 +7,14 @@
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml'/>
@@ -18,11 +22,7 @@
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D63XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D63XML_cfi.py
index fbd3d6a90078d..d78cb3365105a 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D63XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D63XML_cfi.py
@@ -8,10 +8,14 @@
         'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml',
@@ -19,11 +23,7 @@
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D64XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D64XML_cfi.py
index b7b7bb967f64c..1b5356a83b2c8 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D64XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D64XML_cfi.py
@@ -8,10 +8,14 @@
         'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml',
@@ -19,11 +23,7 @@
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D65XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D65XML_cfi.py
index e72fb2f02cef4..62ade3e9aa245 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D65XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D65XML_cfi.py
@@ -8,10 +8,14 @@
         'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml',
@@ -19,11 +23,7 @@
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml',