diff --git a/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml b/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
index 87d78299c4dbd..5c6f30635109b 100644
--- a/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
+++ b/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
@@ -8,12 +8,12 @@
     <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/v3/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
@@ -24,23 +24,23 @@
     <Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v4/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2026/v7/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v2/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v2/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v2/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
     <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v9/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v9/GEMSpecs.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
   </IncludeSection>
diff --git a/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml
index 854f6474f38d9..8cb3da8baf4ba 100644
--- a/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml
+++ b/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml
@@ -468,17 +468,17 @@
  <SpecParSection label="muonGE0Numbering" eval="true">
    <SpecPar name="MuonGE0Sector">
    <PartSelector path="//GE0Box"/>
-   <Parameter name="CopyNoTag" value="[m0_sector]"/>
+   <Parameter name="CopyNoTag" value="[mg_sector]"/>
    <Parameter name="CopyNoOffset" value="1*[super]"/>
   </SpecPar>
   <SpecPar name="MuonGE0Layer">
    <PartSelector path="//GE0L.*"/>
-   <Parameter name="CopyNoTag" value="[m0_layer]"/>
-   <Parameter name="CopyNoOffset" value="3*[super]"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+1"/>
   </SpecPar>
   <SpecPar name="MuonGE0Chamber">
    <PartSelector path="//GHA0.*"/>
-   <Parameter name="CopyNoTag" value="[m0_roll]"/>
+   <Parameter name="CopyNoTag" value="[mg_roll]"/>
    <Parameter name="CopyNoOffset" value="4*[super]"/>
   </SpecPar>
  </SpecParSection>
diff --git a/Geometry/MuonCommonData/python/testGE0XML_cfi.py b/Geometry/MuonCommonData/python/testGE0XML_cfi.py
index c7baf45f0856a..5de8ef75bbff6 100644
--- a/Geometry/MuonCommonData/python/testGE0XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testGE0XML_cfi.py
@@ -6,12 +6,12 @@
         '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/v3/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
@@ -28,7 +28,7 @@
         'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',