diff --git a/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py b/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py
index a92749dfadcc4..ace8ba61d5c6a 100644
--- a/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py
+++ b/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py
@@ -5,7 +5,7 @@
 #
 # Ideal geometry, needed for simulation
 from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import *
-from Geometry.TrackerNumberingBuilder.trackerNumbering2026GeometryDB_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff   import *
 from Geometry.HcalCommonData.hcalSimulationParameters_cff   import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
diff --git a/Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py b/Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py
index 741439917b675..c88f2e32ee1ca 100644
--- a/Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py
+++ b/Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py
@@ -2,4 +2,4 @@
 
 # Ideal geometry, needed for simulation
 from SLHCUpgradeSimulations.Geometry.Phase1_R30F12_cmsSimIdealGeometryXML_cff import *
-from Geometry.TrackerNumberingBuilder.trackerNumbering2026Geometry_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/dependencies.py b/Configuration/Geometry/python/dependencies.py
index 7ed3e0a09b8f8..1fabb1afe77dd 100644
--- a/Configuration/Geometry/python/dependencies.py
+++ b/Configuration/Geometry/python/dependencies.py
@@ -1,2 +1,2 @@
-# this file exists to enforce dependencies for the generate2026Geometry unit test
+# this file exists to enforce dependencies for the generateRun4Geometry unit test
 from Configuration.StandardSequences.GeometryConf import GeometryConf
diff --git a/Configuration/Geometry/python/dictRun4Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py
index b91b48f4f8c22..715994175f7ba 100644
--- a/Configuration/Geometry/python/dictRun4Geometry.py
+++ b/Configuration/Geometry/python/dictRun4Geometry.py
@@ -10,17 +10,17 @@
             '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/v5/cms.xml',
+            'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
             'Geometry/CMSCommonData/data/cmsMother.xml',
             'Geometry/CMSCommonData/data/eta3/etaMax.xml',
             'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+            'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
             'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+            'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
             'Geometry/CMSCommonData/data/cmsMuon.xml',
             'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+            'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+            'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
             'Geometry/CMSCommonData/data/muonMB.xml',
             'Geometry/CMSCommonData/data/muonMagnet.xml',
             'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -37,17 +37,17 @@
             '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/v5/cms.xml',
+            'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
             'Geometry/CMSCommonData/data/cmsMother.xml',
             'Geometry/CMSCommonData/data/eta3/etaMax.xml',
             'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+            'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
             'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+            'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
             'Geometry/CMSCommonData/data/cmsMuon.xml',
             'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+            'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+            'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
             'Geometry/CMSCommonData/data/muonMB.xml',
             'Geometry/CMSCommonData/data/muonMagnet.xml',
             'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -65,17 +65,17 @@
             '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/v5/cms.xml',
+            'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
             'Geometry/CMSCommonData/data/cmsMother.xml',
             'Geometry/CMSCommonData/data/eta3/etaMax.xml',
             'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+            'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
             'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+            'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
             'Geometry/CMSCommonData/data/cmsMuon.xml',
             'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+            'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+            'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
             'Geometry/CMSCommonData/data/muonMB.xml',
             'Geometry/CMSCommonData/data/muonMagnet.xml',
             'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -538,9 +538,9 @@
     "default" : 18,
     "C17" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -569,11 +569,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv15.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -612,9 +612,9 @@
     },
     "C18" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -643,11 +643,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv15.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -686,9 +686,9 @@
     },
     "C19" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -716,11 +716,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -759,9 +759,9 @@
     },
     "C20" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -795,12 +795,12 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv15.xml',
             'Geometry/ForwardSimData/data/hfnosesens.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
             'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
@@ -845,9 +845,9 @@
     },
     "C21" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -875,11 +875,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -918,9 +918,9 @@
     },
     "C22" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -950,11 +950,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv15.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -993,9 +993,9 @@
     },
     "C23" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -1024,11 +1024,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -1067,9 +1067,9 @@
     },
     "C24" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -1098,11 +1098,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -1141,9 +1141,9 @@
     },
     "C25" : {
         1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo/2021/v1/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
@@ -1172,11 +1172,11 @@
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
             'Geometry/HGCalSimData/data/hgcsensv15.xml',
         ],
         4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
             'Geometry/EcalSimData/data/EcalProdCuts.xml',
             'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         ],
@@ -1228,16 +1228,16 @@
             'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
             'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
             'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-            'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-            'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+            'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+            'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
             'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-            'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
             'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-            'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+            'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
             'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-            'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
+            'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
          ],
         2 : [
             'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
@@ -1247,12 +1247,12 @@
             'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-            'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+            'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
             'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
             'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         ],
         4 : [
-            'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+            'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         ],
         "sim" : [
             'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
@@ -1275,16 +1275,16 @@
             'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
             'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
             'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-            'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-            'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+            'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+            'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
             'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-            'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-            'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+            'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+            'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
             'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-            'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
+            'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
          ],
         2 : [
             'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
@@ -1294,12 +1294,12 @@
             'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-            'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+            'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
             'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
             'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         ],
         4 : [
-            'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+            'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         ],
         "sim" : [
             'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
@@ -1322,16 +1322,16 @@
             'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
             'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
             'Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml',
-            'Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml',
-            'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+            'Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml',
+            'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
             'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-            'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-            'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+            'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+            'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
             'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml',
-            'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
+            'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
          ],
         2 : [
             'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
@@ -1341,12 +1341,12 @@
             'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-            'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+            'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
             'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
             'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         ],
         4 : [
-            'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+            'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         ],
         "sim" : [
             'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
@@ -1369,12 +1369,12 @@
     "default" : 8,
     "F8" : {
         1 : [
-            'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+            'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
             'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
             'Geometry/ForwardCommonData/data/lumimaterials.xml',
             'Geometry/ForwardCommonData/data/zdcrotations.xml',
             'Geometry/ForwardCommonData/data/lumirotations.xml',
-            'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
             'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
@@ -1392,12 +1392,12 @@
     },
     "F9" : {
         1 : [
-            'Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml',
+            'Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml',
             'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
             'Geometry/ForwardCommonData/data/lumimaterials.xml',
             'Geometry/ForwardCommonData/data/zdcrotations.xml',
             'Geometry/ForwardCommonData/data/lumirotations.xml',
-            'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
             'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
diff --git a/Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml b/Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml
rename to Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml
diff --git a/Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml b/Geometry/CMSCommonData/data/beampipe/2030/v2/beampipe.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml
rename to Geometry/CMSCommonData/data/beampipe/2030/v2/beampipe.xml
diff --git a/Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml b/Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml
rename to Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v3/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v3/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v4/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v4/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v4/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v4/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/caloBase/2026/v8/caloBase.xml b/Geometry/CMSCommonData/data/caloBase/2030/v8/caloBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/caloBase/2026/v8/caloBase.xml
rename to Geometry/CMSCommonData/data/caloBase/2030/v8/caloBase.xml
diff --git a/Geometry/CMSCommonData/data/cms/2026/v1/cms.xml b/Geometry/CMSCommonData/data/cms/2015/v1/cms.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/cms/2026/v1/cms.xml
rename to Geometry/CMSCommonData/data/cms/2015/v1/cms.xml
diff --git a/Geometry/CMSCommonData/data/cms/2030/v1/cms.xml b/Geometry/CMSCommonData/data/cms/2030/v1/cms.xml
new file mode 100644
index 0000000000000..41809294238e8
--- /dev/null
+++ b/Geometry/CMSCommonData/data/cms/2030/v1/cms.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="cms.xml" eval="true">
+ <Constant name="Rmin"         value="[cmsextent:Rmin]"/>
+ <Constant name="Zmin"         value="[cmsextent:Zmin]"/>
+ <Constant name="HallZ"        value="[cmsextent:HallZ]"/>
+ <Constant name="HallR"        value="[cmsextent:HallR]"/>
+ <Constant name="HallRMax"     value="[cmsextent:HallRMax]"/>
+ <Constant name="CMSR1"        value="[cmsextent:CMSR1]"/>
+ <Constant name="CMSR2"        value="[cmsextent:CMSR2]"/>
+ <Constant name="CMSR3"        value="[cavernData:CMSR3]"/>
+ <Constant name="CMSR4"        value="[cavernData:CMSR4]"/>
+ <Constant name="CMSZ1"        value="[cmsextent:CMSZ1]"/>
+ <Constant name="CMSZ2"        value="[cmsextent:CMSZ2]"/>
+ <Constant name="HFRiseZ1"     value="[cavernData:HFRiseZ1]"/>
+ <Constant name="HFRiseZ2"     value="[cavernData:HFRiseZ2]"/>
+ <Constant name="ShaftY"       value="[cavernData:ShaftY]"/>
+ <Constant name="ShaftZ"       value="[cavernData:ShaftZ]"/>
+ <Constant name="CMSZ2"        value="[cmsextent:CMSZ2]"/>
+ <Constant name="TrackCalorR"  value="1.233*m"/>
+ <Constant name="CalorMuonR"   value="2.950*m"/>
+ <Constant name="CalorMuonR2"  value="2.810*m"/>
+ <Constant name="TrackBeamZ1"  value="1.948*m"/>
+ <Constant name="TrackBeamZ2"  value="2.935*m"/>
+ <Constant name="TrackBeamSupZ1"  value="1.630*m-.6*cm"/>
+ <Constant name="TrackBeamSupZ2"  value="1.630*m+.6*cm"/>
+ <Constant name="TrackBeamR1"  value="2.50*cm"/> <!-- 3.10*cm -->
+ <Constant name="TrackBeamR2"  value="7.40*cm"/>
+ <Constant name="TrackLumiZ1"  value="1.722*m"/>
+ <Constant name="TrackLumiZ2"  value="1.800*m"/>
+ <Constant name="TrackLumiR1"  value="7.70*cm"/>
+ <Constant name="TrackLumiR1Min" value="3.170*cm"/>
+ <Constant name="TrackLumiR2Min" value="3.3*cm"/>
+ <Constant name="CalorBeamZ1"  value="3.180*m"/>
+ <Constant name="CalorBeamZ2"  value="5.541*m"/>
+ <Constant name="CalorBeamZ3"  value="5.245*m"/>
+ <Constant name="CalorBeamR1"  value="8.00*cm"/>
+ <Constant name="CalorBeamR2"  value="8.93*cm"/>
+ <Constant name="MuonBeamZ0"   value="6.50*m"/>
+ <Constant name="MuonBeamZ1"   value="7.499*m"/>
+ <Constant name="MuonBeamZ2"   value="10.86*m"/>
+ <Constant name="MuonBeamR0"   value="10.50*cm"/>
+ <Constant name="MuonBeamR1"   value="11.785*cm"/>
+ <Constant name="MuonBeamR2"   value="76.80*cm"/>
+ <Constant name="TotemMuonZ1"  value="10.165*m"/>
+ <Constant name="TotemMuonZ2"  value="10.50*m"/>
+ <Constant name="TotemMuonR1"  value="1.0411*m"/>
+ <Constant name="TotemMuonR2"  value="1.1300*m"/>
+ <Constant name="TotemBeamZ1"  value="7.9500*m"/>
+ <Constant name="TotemBeamZ2"  value="13.381*m"/>
+ <Constant name="TotemBeamZ3"  value="13.439*m"/>
+ <Constant name="TotemBeamZ4"  value="13.465*m"/>
+ <Constant name="TotemBeamR1"  value="[MuonBeamR1]"/>
+ <Constant name="TotemBeamR2"  value="12.15*cm"/>
+ <Constant name="TotemBeamR3"  value="12.20*cm"/>
+ <Constant name="TotemBeamR4"  value="3.675*cm"/>
+ <Constant name="TotemBeamR5"  value="3.575*cm"/>
+ <Constant name="ForwdBeamZ1"  value="10.539*m"/>
+ <Constant name="ForwdBeamZ2"  value="13.109*m"/>
+ <Constant name="ForwdBeamZ3"  value="13.290*m"/>
+ <Constant name="ForwdBeamZ4"  value="16.0305*m"/>
+ <Constant name="ForwdBeamZ5"  value="16.424*m"/>
+ <Constant name="ForwdBeamZ6"  value="17.058*m"/>
+ <Constant name="ForwdBeamZ7"  value="17.920*m"/>
+ <Constant name="ForwdBeamZ8"  value="18.562*m"/>
+ <Constant name="ForwdBeamZ9"  value="18.905*m"/>
+ <Constant name="ForwdBeamR0"  value="15.95*cm"/>
+ <Constant name="ForwdBeamR1"  value="12.495*cm"/>
+ <Constant name="ForwdBeamR2"  value="12.50*cm"/>
+ <Constant name="ForwdBeamR3"  value="25.0*cm"/>
+ <Constant name="ForwdBeamR4"  value="2.85*cm+0.65*cm"/> <!-- Post LS2 beam-pipe -->
+ <Constant name="ForwdBeamR5"  value="7.50*cm"/>
+ <Constant name="ForwdBeamR6"  value="20.5*cm"/>
+ <Constant name="ForwdBeamR7"  value="4.00*cm"/>
+ <Constant name="ForwdBeamR8"  value="2.15*cm"/>
+ <Constant name="ForwdVcalZ1"  value="11.1495*m"/>
+ <Constant name="ForwdVcalZ2"  value="12.8005*m"/>
+ <Constant name="ForwdVcalR1"  value="1.595*m"/>
+ <Constant name="ForwdDetsZ1"  value="16.0065*m"/>
+ <Constant name="ForwdDetsZ2"  value="16.0065*m-1.6165*m"/>
+ <Constant name="ForwdDetsR1"  value="33.00*cm"/>
+ <Constant name="MBarRmin"     value="3.80*m"/>
+ <Constant name="MBarRmax"     value="[cms:CMSR4]"/>
+ <Constant name="MBarZ"        value="6.61*m"/>
+ <Constant name="MBRingZ"      value="1.268*m"/>
+ <Constant name="MBRing1Zpos"  value="2.686*m"/>
+ <Constant name="MBRing2Zpos"  value="5.342*m"/>
+ <Constant name="MEndcapZ0"    value="6.59*m"/>
+ <Constant name="MEndcapZ1"    value="6.835*m"/>
+ <Constant name="MERmin0"      value="66.569*cm"/>
+ <Constant name="MERmin1"      value="67.50*cm"/>
+ <Constant name="MERmin2"      value="70.00*cm"/>
+ <Constant name="MERmin3"      value="108.60*cm"/>
+</ConstantsSection>
+
+<SolidSection label="cms.xml">
+ <Polycone name="OCMS" startPhi="0*deg" deltaPhi="360*deg" >
+  <ZSection z="-[CMSZ1]"  rMin="[Rmin]"  rMax="[CMSR2]" />
+  <ZSection z="-[HallZ]"  rMin="[Rmin]"  rMax="[CMSR2]" /> 
+  <ZSection z="-[HallZ]"  rMin="[Rmin]"  rMax="[ShaftY]+1*m"/>
+  <ZSection z="-[ShaftZ]" rMin="[Rmin]"  rMax="[ShaftY]+1*m"/>
+  <ZSection z="-[ShaftZ]" rMin="[Rmin]"  rMax="[HallRMax]+360*cm"/>
+  <ZSection z="[HallZ]"   rMin="[Rmin]"  rMax="[HallRMax]+360*cm"/>
+  <ZSection z="[HallZ]"   rMin="[Rmin]"  rMax="[CMSR2]" />
+  <ZSection z="[CMSZ1]"   rMin="[Rmin]"  rMax="[CMSR2]" />
+ </Polycone> 
+ <Polycone name="CMSEp" startPhi="0*deg" deltaPhi="360*deg" >
+  <ZSection z="-[CMSZ1]"  rMin="[Rmin]"  rMax="[CMSR2]"/>
+  <ZSection z="-[CMSZ2]"  rMin="[Rmin]"  rMax="[CMSR2]"/> 
+  <ZSection z="-[CMSZ2]"  rMin="[Rmin]"  rMax="[CMSR4]"/>
+  <ZSection z="-[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR4]"/>
+  <ZSection z="-[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR3]"/>
+  <ZSection z="-[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR3]"/>
+  <ZSection z="-[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
+  <ZSection z="[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
+  <ZSection z="[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR3]"/>
+  <ZSection z="[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR3]"/>
+  <ZSection z="[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR4]"/>
+  <ZSection z="[CMSZ2]"   rMin="[Rmin]"  rMax="[CMSR4]"/>
+  <ZSection z="[CMSZ2]"   rMin="[Rmin]"  rMax="[CMSR2]"/>
+  <ZSection z="[CMSZ1]"   rMin="[Rmin]"  rMax="[CMSR2]"/>
+ </Polycone> 
+ <Box name="YBFeetBox" dx="505*cm" dy="280*cm" dz="670*cm"/>
+ <UnionSolid name="CMSE">
+   <rSolid name="CMSEp"/>
+   <rSolid name="YBFeetBox"/>
+   <Translation x="0*fm" y="-880*cm+280*cm" z="0*fm"/>
+ </UnionSolid>
+</SolidSection>
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="MCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/cms/2026/v2/cms.xml b/Geometry/CMSCommonData/data/cms/2030/v2/cms.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/cms/2026/v2/cms.xml
rename to Geometry/CMSCommonData/data/cms/2030/v2/cms.xml
diff --git a/Geometry/CMSCommonData/data/cms/2026/v3/cms.xml b/Geometry/CMSCommonData/data/cms/2030/v3/cms.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/cms/2026/v3/cms.xml
rename to Geometry/CMSCommonData/data/cms/2030/v3/cms.xml
diff --git a/Geometry/CMSCommonData/data/cms/2026/v4/cms.xml b/Geometry/CMSCommonData/data/cms/2030/v4/cms.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/cms/2026/v4/cms.xml
rename to Geometry/CMSCommonData/data/cms/2030/v4/cms.xml
diff --git a/Geometry/CMSCommonData/data/cms/2026/v5/cms.xml b/Geometry/CMSCommonData/data/cms/2030/v5/cms.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/cms/2026/v5/cms.xml
rename to Geometry/CMSCommonData/data/cms/2030/v5/cms.xml
diff --git a/Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml b/Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml
rename to Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml
index 08d647593d1ab..3ed3483b92f59 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml
index 543c7b052c58a..5df17bc6c8e4a 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml
index 1df96c04b7e21..939da8b73dedd 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml
index c8dc35803afe4..ed6f644467d19 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D104.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D104.xml
index c0ffcf3fdfa81..f9d8985c73438 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D104.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D104.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml
index 65c77d4a8c632..946660c78056e 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml
index b96dd87b8fdb3..bdcb21a6fb12c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml
index d8ea30f0160df..4fd3c512b233b 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml
index 49c460b173297..b8f626812ad68 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -70,22 +70,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -99,21 +99,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml
index 8068840610f50..4abaf781bd235 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml
index 4c4cbf550a410..cbf5c39436dcf 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D111.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D111.xml
index 1e4e794b96ec8..dc4e4677bd4a9 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D111.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D111.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT806_IT741_2024_01/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D112.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D112.xml
index abbc720f156b5..d5cf7f27b910f 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D112.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D112.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT806_IT741_2024_01/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D113.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D113.xml
index f3b8c16bb1c47..3f8708c890aea 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D113.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D113.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT806_IT741_2024_01/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -71,22 +71,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -100,21 +100,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D114.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D114.xml
index 35e012d488d88..05db625f38a1d 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D114.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D114.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -70,22 +70,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -99,21 +99,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml
index 4095d3854b66f..cd1b03266bcf2 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -41,9 +41,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -76,22 +76,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -105,23 +105,23 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/ForwardSimData/data/hfnosesens.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
     <Include ref='Geometry/ForwardSimData/data/hfnoseProdCuts.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml
index 0e3cf107d8d00..cb9116b56a66b 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml
@@ -9,17 +9,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo/2021/v1/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <Include ref='Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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/2026/v1/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml
index c817f9a9fadd6..e0510a5301c2e 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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_Eta16/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml
index 546dd172b582b..13ac40c746bbe 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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_Eta16/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml
index abc9479c321d9..3a05488a54c5a 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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_Eta16/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml
index 813922779e6b3..3bd06207f3807 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml
@@ -8,17 +8,17 @@
     <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/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/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/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
     <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/2026/v3/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/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/rpcf/2030/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_Eta16/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
     <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
-    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
diff --git a/Geometry/CMSCommonData/data/muonBase/2026/v1/muonBase.xml b/Geometry/CMSCommonData/data/muonBase/2015/v1/muonBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/muonBase/2026/v1/muonBase.xml
rename to Geometry/CMSCommonData/data/muonBase/2015/v1/muonBase.xml
diff --git a/Geometry/CMSCommonData/data/muonBase/2030/v1/muonBase.xml b/Geometry/CMSCommonData/data/muonBase/2030/v1/muonBase.xml
new file mode 100644
index 0000000000000..c04581e2c2c4c
--- /dev/null
+++ b/Geometry/CMSCommonData/data/muonBase/2030/v1/muonBase.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<SolidSection label="muonBase.xml">
+  <Tubs name="MUON1" rMin="[cms:CalorMuonR]" rMax="[cms:CMSR1]" dz="[cms:MuonBeamZ2]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="MUON2" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="-[cms:MuonBeamZ2]"  rMin="[cms:MERmin3]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:TotemMuonZ2]" rMin="[cms:MERmin3]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:TotemMuonZ2]" rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR1]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:MEndcapZ1]"   rMin="[cms:MERmin2]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:MBarZ]"       rMin="[cms:MERmin1]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:MEndcapZ0]"   rMin="[cms:MERmin1]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:MuonBeamZ0]"  rMin="[cms:MuonBeamR0]"  rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="-[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
+    <ZSection z="-[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
+  </Polycone>
+  <Polycone name="MUON3" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[cms:CalorBeamZ3]"  rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
+    <ZSection z="[cms:CalorBeamZ2]"  rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
+    <ZSection z="[cms:CalorBeamZ2]"  rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:MuonBeamZ0]"   rMin="[cms:MuonBeamR0]"  rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:MEndcapZ0]"    rMin="[cms:MERmin1]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:MBarZ]"        rMin="[cms:MERmin1]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:MEndcapZ1]"    rMin="[cms:MERmin2]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:TotemMuonZ1]"  rMin="[cms:TotemMuonR1]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:TotemMuonZ1]"  rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:TotemMuonZ2]"  rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:TotemMuonZ2]"  rMin="[cms:MERmin3]"     rMax="[cms:CalorMuonR]"/>
+    <ZSection z="[cms:MuonBeamZ2]"   rMin="[cms:MERmin3]"     rMax="[cms:CalorMuonR]"/>
+  </Polycone>
+  <UnionSolid name="MUON0">
+    <rSolid name="MUON1"/>
+    <rSolid name="MUON2"/>
+    <Translation x="0.0*fm" y="0.0*fm" z="0.0*fm"/>
+  </UnionSolid>
+  <UnionSolid name="MUON">
+    <rSolid name="MUON0"/>
+    <rSolid name="MUON3"/>
+    <Translation x="0.0*fm" y="0.0*fm" z="0.0*fm"/>
+  </UnionSolid>
+  <Tubs name="MB" rMin="[cms:MBarRmin]" rMax="[cms:CMSR1]" dz="[cms:MBarZ]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="MBWheel" rMin="[cms:MBarRmin]" rMax="[cms:MBarRmax]" dz="[cms:MBRingZ]" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="muonBase.xml">
+  <LogicalPart name="MUON" category="unspecified">
+    <rSolid name="MUON"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="MB" category="unspecified">
+    <rSolid name="MB"/>
+    <rMaterial name="materials:M_B_Air"/>
+  </LogicalPart>
+  <LogicalPart name="MBWheel_0" category="unspecified">
+    <rSolid name="MBWheel"/>
+    <rMaterial name="materials:M_B_Air"/>
+  </LogicalPart>
+  <LogicalPart name="MBWheel_1P" category="unspecified">
+    <rSolid name="MBWheel"/>
+    <rMaterial name="materials:M_B_Air"/>
+  </LogicalPart>
+  <LogicalPart name="MBWheel_2P" category="unspecified">
+    <rSolid name="MBWheel"/>
+    <rMaterial name="materials:M_B_Air"/>
+  </LogicalPart>
+  <LogicalPart name="MBWheel_1N" category="unspecified">
+    <rSolid name="MBWheel"/>
+    <rMaterial name="materials:M_B_Air"/>
+  </LogicalPart>
+  <LogicalPart name="MBWheel_2N" category="unspecified">
+    <rSolid name="MBWheel"/>
+    <rMaterial name="materials:M_B_Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml b/Geometry/CMSCommonData/data/muonBase/2030/v2/muonBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml
rename to Geometry/CMSCommonData/data/muonBase/2030/v2/muonBase.xml
diff --git a/Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml b/Geometry/CMSCommonData/data/muonBase/2030/v3/muonBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml
rename to Geometry/CMSCommonData/data/muonBase/2030/v3/muonBase.xml
diff --git a/Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml b/Geometry/CMSCommonData/data/muonBase/2030/v4/muonBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml
rename to Geometry/CMSCommonData/data/muonBase/2030/v4/muonBase.xml
diff --git a/Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml b/Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml
similarity index 100%
rename from Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml
rename to Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py
index 167ecf21ae2d0..1b9a8fa0eabed 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py
@@ -9,11 +9,11 @@
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         # 'Geometry/CMSCommonData/data/cms.xml',            # Phase-1 Muon
         'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v1/cms.xml',      # Phase-2 Muon
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',      # Phase-2 Muon
+        'Geometry/CMSCommonData/data/cms/2015/v1/cms.xml',     
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',      
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v1/muonBase.xml', # Phase-2 Muon
+        'Geometry/CMSCommonData/data/muonBase/2015/v1/muonBase.xml', # Phase-2 Muon
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2015/v1/beampipe.xml',
@@ -210,13 +210,13 @@
         'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
         'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v1/mf.xml',        # Phase-2 Muon
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',    # Phase-2 Muon
+        'Geometry/MuonCommonData/data/mf/2030/v1/mf.xml',        # Phase-2 Muon
+        'Geometry/MuonCommonData/data/rpcf/2030/v1/rpcf.xml',    # Phase-2 Muon
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', # Phase-2 Muon
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',  # Phase-2 Muon
         'Geometry/MuonCommonData/data/gem21/TDR_BaseLine/gem21.xml',  # Phase-2 Muon
         'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',  # Phase-2 Muon
+        'Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml',  # Phase-2 Muon
         'Geometry/MuonCommonData/data/me0/TDR_BaseLine/me0.xml',  # Phase-2 Muon
         # --- Muon ------------------------------------------------------------
 
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
index a1cc0f53e4a1c..e72be6f070b62 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
@@ -16,8 +16,8 @@
         'Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py
index 8b68c2538ef3c..b05c0aa35d0e6 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py
index 5a3bcbeecb3ae..d0bec22bbbab9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py
index 945289b68c780..64b01c7b7d098 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py
index 80a16e30c99b3..bffc3001b0aad 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py
index 22779bbcef403..ec10b69c19eef 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py
index 24a7ed1df3ee6..5b65651da7c8c 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py
index a1d60d61f432d..aee673bd9717c 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py
index a93127b0874cd..25793f13ed8e6 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py
index 6d1aa57b8bbcd..1d7933550eddc 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -71,22 +71,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -102,21 +102,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py
index e5c8f0be32f3d..5f508edf59611 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py
index 01c06221da807..f0a4ae497ddbb 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py
index 325379e4ee11e..20463b9c7fd07 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT806_IT741_2024_01/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py
index f51ad8d014d11..8384eae0383f2 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT806_IT741_2024_01/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py
index 2a3b7d1a6e211..52224ce6f7c8e 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT806_IT741_2024_01/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +72,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +103,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py
index 8814481a55d29..d1577299bbf7c 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -71,22 +71,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -102,21 +102,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py
index 3ff1891234d7a..3ec1bee3dc5c9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +42,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -77,22 +77,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -108,23 +108,23 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/ForwardSimData/data/hfnosesens.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py
index 21de4ae69e0a8..f6d12775fe0c5 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py
@@ -10,17 +10,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo/2021/v1/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py
index 9b4e7b5054b31..b6cacf38d0e97 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py
index edd74f1ebc0fc..29a363c91d982 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98CaloXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98CaloXML_cfi.py
index 33bc5c05e21b1..0557fe3b94d10 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98CaloXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98CaloXML_cfi.py
@@ -6,23 +6,23 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -44,12 +44,12 @@
         'Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml',
         'Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
@@ -57,10 +57,10 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98MuonXML_cfi.py
index 42d5683a8f7c0..7d49ac6f41f1a 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98MuonXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98MuonXML_cfi.py
@@ -1,24 +1,21 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -29,25 +26,25 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
     ),
     rootNodeName = cms.string('cms:OCMS')
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98TrackerXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98TrackerXML_cfi.py
index be222ce1fbc46..458996b48980f 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98TrackerXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98TrackerXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py
index 991fba49a0d10..50c3df0ab51ca 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
index e4da741654034..b64d5fb60aac1 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
@@ -9,17 +9,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +43,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +73,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +104,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml b/Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml
rename to Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml
diff --git a/Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml b/Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml
rename to Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml
diff --git a/Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml b/Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml
rename to Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml
diff --git a/Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml b/Geometry/EcalCommonData/data/eregalgo/2030/v1/eregalgo.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml
rename to Geometry/EcalCommonData/data/eregalgo/2030/v1/eregalgo.xml
diff --git a/Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml b/Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml
rename to Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml
diff --git a/Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml b/Geometry/EcalCommonData/data/esalgo/2030/v1/esalgo.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml
rename to Geometry/EcalCommonData/data/esalgo/2030/v1/esalgo.xml
diff --git a/Geometry/EcalCommonData/data/escon/2026/v1/escon.xml b/Geometry/EcalCommonData/data/escon/2030/v1/escon.xml
similarity index 100%
rename from Geometry/EcalCommonData/data/escon/2026/v1/escon.xml
rename to Geometry/EcalCommonData/data/escon/2030/v1/escon.xml
diff --git a/Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml b/Geometry/ForwardCommonData/data/brm/2030/v1/brm.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml
rename to Geometry/ForwardCommonData/data/brm/2030/v1/brm.xml
diff --git a/Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml b/Geometry/ForwardCommonData/data/brm/2030/v2/brm.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml
rename to Geometry/ForwardCommonData/data/brm/2030/v2/brm.xml
diff --git a/Geometry/ForwardCommonData/data/brm/2026/v3/brm.xml b/Geometry/ForwardCommonData/data/brm/2030/v3/brm.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/brm/2026/v3/brm.xml
rename to Geometry/ForwardCommonData/data/brm/2030/v3/brm.xml
diff --git a/Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml b/Geometry/ForwardCommonData/data/forwardshield/2030/v1/forwardshield.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml
rename to Geometry/ForwardCommonData/data/forwardshield/2030/v1/forwardshield.xml
diff --git a/Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml b/Geometry/ForwardCommonData/data/forwardshield/2030/v2/forwardshield.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml
rename to Geometry/ForwardCommonData/data/forwardshield/2030/v2/forwardshield.xml
diff --git a/Geometry/ForwardCommonData/data/forwardshield/2026/v3/forwardshield.xml b/Geometry/ForwardCommonData/data/forwardshield/2030/v3/forwardshield.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/forwardshield/2026/v3/forwardshield.xml
rename to Geometry/ForwardCommonData/data/forwardshield/2030/v3/forwardshield.xml
diff --git a/Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml b/Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml
rename to Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml
diff --git a/Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml b/Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml
rename to Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml
diff --git a/Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml b/Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml
rename to Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml
diff --git a/Geometry/ForwardCommonData/data/zdc/2026/v2/zdc.xml b/Geometry/ForwardCommonData/data/zdc/2030/v2/zdc.xml
similarity index 100%
rename from Geometry/ForwardCommonData/data/zdc/2026/v2/zdc.xml
rename to Geometry/ForwardCommonData/data/zdc/2030/v2/zdc.xml
diff --git a/Geometry/ForwardCommonData/python/hfnoseAloneXML_cfi.py b/Geometry/ForwardCommonData/python/hfnoseAloneXML_cfi.py
index 2da5210f62000..12ab6ce9a1ab9 100644
--- a/Geometry/ForwardCommonData/python/hfnoseAloneXML_cfi.py
+++ b/Geometry/ForwardCommonData/python/hfnoseAloneXML_cfi.py
@@ -6,10 +6,10 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
         'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml',
diff --git a/Geometry/ForwardCommonData/python/hfnoseXML_cfi.py b/Geometry/ForwardCommonData/python/hfnoseXML_cfi.py
index aa9743efc047a..c6bf2bd493a57 100644
--- a/Geometry/ForwardCommonData/python/hfnoseXML_cfi.py
+++ b/Geometry/ForwardCommonData/python/hfnoseXML_cfi.py
@@ -6,13 +6,13 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
         'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml',
         'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
         'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
diff --git a/Geometry/ForwardCommonData/python/testHFNoseXML_cfi.py b/Geometry/ForwardCommonData/python/testHFNoseXML_cfi.py
index 2022e9e8ac949..bb0c36dd29a7f 100644
--- a/Geometry/ForwardCommonData/python/testHFNoseXML_cfi.py
+++ b/Geometry/ForwardCommonData/python/testHFNoseXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -75,17 +75,17 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
@@ -106,23 +106,23 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/ForwardSimData/data/hfnosesens.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0TestReco_cff.py b/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0TestReco_cff.py
index 640a6718e020e..6bedfb48f9d94 100644
--- a/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0TestReco_cff.py
+++ b/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0TestReco_cff.py
@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
+# This config was generated automatically using generateRun4Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from GeometryExtended2026GE0Test_cff import *
+from GeometryExtendedRun4GE0Test_cff import *
 
 # tracker
 from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
diff --git a/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0Test_cff.py b/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0Test_cff.py
index 75682e7d0cddf..1b5dc6acc306c 100644
--- a/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0Test_cff.py
+++ b/Geometry/GEMGeometry/test/GeometryExtendedRun4GE0Test_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
+# This config was generated automatically using generateRun4Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
 from cmsExtendedGeometryRun4GE0TestXML_cfi import *
diff --git a/Geometry/GEMGeometry/test/cmsExtendedGeometryRun4GE0TestXML_cfi.py b/Geometry/GEMGeometry/test/cmsExtendedGeometryRun4GE0TestXML_cfi.py
index 8919dfa6ab5c0..c48cb46786afd 100644
--- a/Geometry/GEMGeometry/test/cmsExtendedGeometryRun4GE0TestXML_cfi.py
+++ b/Geometry/GEMGeometry/test/cmsExtendedGeometryRun4GE0TestXML_cfi.py
@@ -1,8 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials.xml',
@@ -14,16 +11,16 @@
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         '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/v3/cms.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v3/cms.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v3/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
@@ -42,9 +39,9 @@
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -74,13 +71,13 @@
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v4/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v4/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v2/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/ge0/TDR_Dev/v2/ge0.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
@@ -110,7 +107,7 @@
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v9/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v9/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
diff --git a/Geometry/GlobalTrackingGeometryBuilder/test/testGlobalTrackingGeometry_cfg.py b/Geometry/GlobalTrackingGeometryBuilder/test/testGlobalTrackingGeometry_cfg.py
index d084295f27403..11d12ba851d2c 100644
--- a/Geometry/GlobalTrackingGeometryBuilder/test/testGlobalTrackingGeometry_cfg.py
+++ b/Geometry/GlobalTrackingGeometryBuilder/test/testGlobalTrackingGeometry_cfg.py
@@ -2,7 +2,7 @@
 from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 
 process = cms.Process("Demo",Phase2C17I13M9)
-process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4D99Reco_cff')
 
 process.load('FWCore.MessageLogger.MessageLogger_cfi')
 if 'MessageLogger' in process.__dict__:
diff --git a/Geometry/HGCalCommonData/python/testHGCV16XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV16XML_cfi.py
index 3a9b752468e77..5c00d53e97fc1 100644
--- a/Geometry/HGCalCommonData/python/testHGCV16XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCV16XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -64,7 +64,7 @@
         'Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml',
         'Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
     )+
     cms.vstring(
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
@@ -73,14 +73,14 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v1/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v7/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v5/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
@@ -92,7 +92,7 @@
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/HcalSimData/data/hf.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCV17XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV17XML_cfi.py
index 18f99bb4bc503..782b2bf66ef86 100644
--- a/Geometry/HGCalCommonData/python/testHGCV17XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCV17XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -101,13 +101,13 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
@@ -115,7 +115,7 @@
         'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCV17nXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV17nXML_cfi.py
index 73b77723b5fac..ae0acf788d022 100644
--- a/Geometry/HGCalCommonData/python/testHGCV17nXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCV17nXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -69,22 +69,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -100,13 +100,13 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
@@ -114,7 +114,7 @@
         'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalEEV16XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalEEV16XML_cfi.py
index a3ce02c942345..796ea2e5d70fc 100644
--- a/Geometry/HGCalCommonData/python/testHGCalEEV16XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalEEV16XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalEEV17XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalEEV17XML_cfi.py
index 2ae779ea05527..d97d1bf5c91b0 100644
--- a/Geometry/HGCalCommonData/python/testHGCalEEV17XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalEEV17XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalEEV18XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalEEV18XML_cfi.py
index 98d83e6bd8fde..e5785d6e01b16 100644
--- a/Geometry/HGCalCommonData/python/testHGCalEEV18XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalEEV18XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalEEV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalEEV19XML_cfi.py
index 8e9d342abfcd9..87da0e9031c81 100644
--- a/Geometry/HGCalCommonData/python/testHGCalEEV19XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalEEV19XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEmixV16XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEmixV16XML_cfi.py
index 78b823db1fa34..fa009c3ba5454 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEmixV16XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEmixV16XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEmixV17XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEmixV17XML_cfi.py
index ab22a8ef59c23..1e7ba8d7c8187 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEmixV17XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEmixV17XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEmixV18XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEmixV18XML_cfi.py
index 95de86e270df1..a2d7a282ca1ca 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEmixV18XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEmixV18XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEmixV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEmixV19XML_cfi.py
index 188d56da6defb..bda231d6bb1b1 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEmixV19XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEmixV19XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEsilV16XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEsilV16XML_cfi.py
index d1700f368bb07..b0f4336bafb6a 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEsilV16XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEsilV16XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEsilV17XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEsilV17XML_cfi.py
index 800154e632edb..5496d2666ec1f 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEsilV17XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEsilV17XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEsilV18XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEsilV18XML_cfi.py
index d9385358edd65..210c0b539d189 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEsilV18XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEsilV18XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalHEsilV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEsilV19XML_cfi.py
index 9b31cb3918da9..22405d16342eb 100644
--- a/Geometry/HGCalCommonData/python/testHGCalHEsilV19XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalHEsilV19XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalPassiveV18XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalPassiveV18XML_cfi.py
index a04308ee6dde8..0fd4320bdea57 100644
--- a/Geometry/HGCalCommonData/python/testHGCalPassiveV18XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalPassiveV18XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py
index 750d59d6d1a6c..05f49e9309a7d 100644
--- a/Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalPassiveV19cXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalPassiveV19cXML_cfi.py
index 230b1b60477c3..9cec600ff4b03 100644
--- a/Geometry/HGCalCommonData/python/testHGCalPassiveV19cXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalPassiveV19cXML_cfi.py
@@ -6,10 +6,10 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV16XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV16XML_cfi.py
index 3be193c4190c0..4b1755788d26e 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV16XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV16XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -101,13 +101,13 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
@@ -115,7 +115,7 @@
         'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV17ShiftXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV17ShiftXML_cfi.py
index 1b429b3e392d8..62d8293ff8a84 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV17ShiftXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV17ShiftXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -101,21 +101,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV17XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV17XML_cfi.py
index d773887a940ef..f822e831b4a0b 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV17XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV17XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -101,21 +101,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV17nXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV17nXML_cfi.py
index caa1cccd4c80e..38d148b06ddad 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV17nXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV17nXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -69,22 +69,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -100,21 +100,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV17ngXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV17ngXML_cfi.py
index 3949fd1b1458d..12770f17d2074 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV17ngXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV17ngXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -69,22 +69,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -100,21 +100,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV18OXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV18OXML_cfi.py
index 5ed763c8acbf4..ad86a4c62685a 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV18OXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV18OXML_cfi.py
@@ -1,18 +1,15 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml',
@@ -24,9 +21,9 @@
         'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml',
         'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
     ),
diff --git a/Geometry/HGCalCommonData/python/testHGCalV18XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV18XML_cfi.py
index 052f14d627d57..6c9b0dfc1fd20 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV18XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV18XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -71,22 +71,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -102,21 +102,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV18nXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV18nXML_cfi.py
index 59cadb36977e1..e7b51ead9c204 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV18nXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV18nXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -101,21 +101,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py
index 4af018e161211..3e059e4559301 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v8/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v8/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -71,22 +71,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -102,21 +102,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv17n.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py
index 194bb759a6d65..ac243c71ffcaf 100644
--- a/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py
+++ b/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py
@@ -14,7 +14,7 @@
                                'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml',
-                               'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'
+                               'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml'
                                ),
     rootNodeName = cms.string('cms:OCMS')
 )
diff --git a/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py
index c5fa4490308f0..7d5dd19a226ba 100644
--- a/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py
+++ b/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py
@@ -11,7 +11,7 @@
                                'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml',
-                               'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'
+                               'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml'
  
                                ),
     rootNodeName = cms.string('cms:OCMS')
diff --git a/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py
index 4a7b7b98d7fc5..4bbb96bd65a98 100644
--- a/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py
+++ b/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py
@@ -11,7 +11,7 @@
                                'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml',
-                               'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'
+                               'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml'
  
                                ),
     rootNodeName = cms.string('cms:OCMS')
diff --git a/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py
index 6a4671cefe747..20f8781916100 100644
--- a/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py
+++ b/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py
@@ -14,7 +14,7 @@
                                'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
                                'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml',
-                               'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'
+                               'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml'
  
                                ),
     rootNodeName = cms.string('cms:OCMS')
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2030/hcalRecNumbering.xml
similarity index 100%
rename from Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml
rename to Geometry/HcalCommonData/data/hcalRecNumbering/2030/hcalRecNumbering.xml
diff --git a/Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/hcalSimNumbering/2030/hcalSimNumbering.xml
similarity index 100%
rename from Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml
rename to Geometry/HcalCommonData/data/hcalSimNumbering/2030/hcalSimNumbering.xml
diff --git a/Geometry/HcalCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py b/Geometry/HcalCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
index 157b81d870aa7..28a8c8a04daa0 100644
--- a/Geometry/HcalCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
+++ b/Geometry/HcalCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
@@ -1,25 +1,22 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -104,21 +101,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/HcalCommonData/python/testHcalOnlyGeometryXML_cfi.py b/Geometry/HcalCommonData/python/testHcalOnlyGeometryXML_cfi.py
index 05ed21d99fbd2..e7a8bb479ebbf 100644
--- a/Geometry/HcalCommonData/python/testHcalOnlyGeometryXML_cfi.py
+++ b/Geometry/HcalCommonData/python/testHcalOnlyGeometryXML_cfi.py
@@ -8,7 +8,7 @@
         'Geometry/CMSCommonData/data/normal/cmsextent.xml', 
         'Geometry/CMSCommonData/data/cms/2017/v1/cms.xml', 
         'Geometry/CMSCommonData/data/cmsMother.xml', 
-        'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml', 
+        'Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml', 
         'Geometry/CMSCommonData/data/cmsCalo.xml', 
         'Geometry/CMSCommonData/data/muonBase.xml', 
         'Geometry/CMSCommonData/data/cmsMuon.xml', 
diff --git a/Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py b/Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py
index 9293b5fa4b7b9..00ccab96beab1 100644
--- a/Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py
+++ b/Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,19 +70,19 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
+        'Geometry/ForwardCommonData/data/brm/2030/v1/brm.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
@@ -98,21 +98,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py b/Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py
index 684b7f9b26c28..5aeac5851f052 100644
--- a/Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py
+++ b/Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py
@@ -1,25 +1,22 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -43,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -73,19 +70,19 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
+        'Geometry/ForwardCommonData/data/brm/2030/v1/brm.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
@@ -106,22 +103,22 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v2/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v1/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v1/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v1/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v1/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v1c/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v1c/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v1c/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v1c/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v2/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v2/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v3/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v3/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v3/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v3/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v3c/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v3c/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v3c/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v3c/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v4/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v4/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v4/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v4/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v4c/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v4c/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v4c/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v4c/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v5/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v5/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v5/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v5/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml b/Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml
similarity index 100%
rename from Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml
rename to Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml
diff --git a/Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml b/Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml
similarity index 100%
rename from Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml
rename to Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml
diff --git a/Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml b/Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml
rename to Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml
diff --git a/Geometry/MuonCommonData/data/ge0shield/2026/v2/ge0shield.xml b/Geometry/MuonCommonData/data/ge0shield/2030/v2/ge0shield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/ge0shield/2026/v2/ge0shield.xml
rename to Geometry/MuonCommonData/data/ge0shield/2030/v2/ge0shield.xml
diff --git a/Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml b/Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml
rename to Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v1/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v1/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v1/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v1/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v2/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v2/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v2/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v2/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v3/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v3/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v3/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v3/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v4/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v4/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v4/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v4/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v5/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v5/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v5/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v5/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v6/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v6/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v6/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v6/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v7/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v7/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v7/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v7/mf.xml
diff --git a/Geometry/MuonCommonData/data/mf/2026/v8/mf.xml b/Geometry/MuonCommonData/data/mf/2030/v8/mf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mf/2026/v8/mf.xml
rename to Geometry/MuonCommonData/data/mf/2030/v8/mf.xml
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml
rename to Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v2/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2030/v2/mfshield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mfshield/2026/v2/mfshield.xml
rename to Geometry/MuonCommonData/data/mfshield/2030/v2/mfshield.xml
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v3/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2030/v3/mfshield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mfshield/2026/v3/mfshield.xml
rename to Geometry/MuonCommonData/data/mfshield/2030/v3/mfshield.xml
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v4/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2030/v4/mfshield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mfshield/2026/v4/mfshield.xml
rename to Geometry/MuonCommonData/data/mfshield/2030/v4/mfshield.xml
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2030/v5/mfshield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml
rename to Geometry/MuonCommonData/data/mfshield/2030/v5/mfshield.xml
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml
rename to Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml
diff --git a/Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml b/Geometry/MuonCommonData/data/muonYoke/2030/v1/muonYoke.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml
rename to Geometry/MuonCommonData/data/muonYoke/2030/v1/muonYoke.xml
diff --git a/Geometry/MuonCommonData/data/muonYoke/2026/v2/muonYoke.xml b/Geometry/MuonCommonData/data/muonYoke/2030/v2/muonYoke.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/muonYoke/2026/v2/muonYoke.xml
rename to Geometry/MuonCommonData/data/muonYoke/2030/v2/muonYoke.xml
diff --git a/Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml b/Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml
rename to Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml
diff --git a/Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml b/Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml
rename to Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml
diff --git a/Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2030/v1/rpcf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml
rename to Geometry/MuonCommonData/data/rpcf/2030/v1/rpcf.xml
diff --git a/Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2030/v2/rpcf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml
rename to Geometry/MuonCommonData/data/rpcf/2030/v2/rpcf.xml
diff --git a/Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml
rename to Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml
diff --git a/Geometry/MuonCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py b/Geometry/MuonCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py
index 188c1b7ac1990..27fec75991d4b 100644
--- a/Geometry/MuonCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py
+++ b/Geometry/MuonCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py
@@ -6,17 +6,17 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -40,9 +40,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -70,22 +70,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -101,21 +101,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v4/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
diff --git a/Geometry/MuonCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py b/Geometry/MuonCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
new file mode 100644
index 0000000000000..27fec75991d4b
--- /dev/null
+++ b/Geometry/MuonCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py
@@ -0,0 +1,125 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        '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/2030/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v2/trackingMaterialGroups_ForPhaseII.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
+        'Geometry/MTDCommonData/data/btl/v2/btl.xml',
+        'Geometry/MTDCommonData/data/etl/v7/etl.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v4/mtdStructureTopology.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v4/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/v4/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/v4/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py
index a25895540f5a2..8b1020a10a80d 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py
@@ -1,8 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials.xml',
@@ -14,16 +11,16 @@
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         '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/v3/cms.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v3/cms.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v3/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
@@ -42,9 +39,9 @@
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -74,12 +71,12 @@
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
@@ -110,7 +107,7 @@
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2026D54GE0XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometryRun4D54GE0XML_cfi.py
similarity index 88%
rename from Geometry/MuonCommonData/python/testExtendedGeometry2026D54GE0XML_cfi.py
rename to Geometry/MuonCommonData/python/testExtendedGeometryRun4D54GE0XML_cfi.py
index be30051efa98f..84cc31d5df9ea 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2026D54GE0XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometryRun4D54GE0XML_cfi.py
@@ -1,8 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials.xml',
@@ -14,16 +11,16 @@
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         '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/v3/cms.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v3/cms.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v3/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
@@ -42,9 +39,9 @@
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -74,12 +71,12 @@
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v4/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v4/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v2/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/mfshield/2026/v2/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v2/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v2/ge0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
@@ -110,7 +107,7 @@
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v9/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v9/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometryRun4D54XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometryRun4D54XML_cfi.py
new file mode 100644
index 0000000000000..8b1020a10a80d
--- /dev/null
+++ b/Geometry/MuonCommonData/python/testExtendedGeometryRun4D54XML_cfi.py
@@ -0,0 +1,126 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
+        '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/2030/v3/cms.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v3/muonBase.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker700/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/brmrotations.xml',
+        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/btl.xml',
+        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
+        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml',
+        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
+        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv9.xml',
+        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml',
+        'Geometry/ForwardCommonData/data/brmsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/MuonCommonData/python/testGE0XML_cfi.py b/Geometry/MuonCommonData/python/testGE0XML_cfi.py
index 96bfb5dd40100..35b1f11b0d697 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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
@@ -22,22 +22,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v1/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
diff --git a/Geometry/MuonCommonData/python/testGEMAllXML_cfi.py b/Geometry/MuonCommonData/python/testGEMAllXML_cfi.py
index 9e1b2783a2437..de66d7a0d304c 100644
--- a/Geometry/MuonCommonData/python/testGEMAllXML_cfi.py
+++ b/Geometry/MuonCommonData/python/testGEMAllXML_cfi.py
@@ -6,22 +6,22 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
     ),
     rootNodeName = cms.string('cms:OCMS')
diff --git a/Geometry/MuonCommonData/python/testGEMXML_cfi.py b/Geometry/MuonCommonData/python/testGEMXML_cfi.py
index 3267616d30a95..c3ee29895f07d 100644
--- a/Geometry/MuonCommonData/python/testGEMXML_cfi.py
+++ b/Geometry/MuonCommonData/python/testGEMXML_cfi.py
@@ -6,16 +6,16 @@
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
@@ -24,21 +24,21 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v6/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v1/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v6/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
         'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v4/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v4/mfshield.xml',
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
         'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml',
         'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
diff --git a/Geometry/MuonCommonData/python/testMFXML_cfi.py b/Geometry/MuonCommonData/python/testMFXML_cfi.py
index 259146e9d9547..373cc02c54d2b 100644
--- a/Geometry/MuonCommonData/python/testMFXML_cfi.py
+++ b/Geometry/MuonCommonData/python/testMFXML_cfi.py
@@ -1,24 +1,21 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v1/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v1/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v2/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
@@ -47,21 +44,21 @@
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v1/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
         'Geometry/EcalCommonData/data/eecon.xml',
-        'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
-        'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
+        'Geometry/EcalCommonData/data/escon/2030/v1/escon.xml',
+        'Geometry/EcalCommonData/data/esalgo/2030/v1/esalgo.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
         'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
         'Geometry/HcalCommonData/data/hcalendcap/HGCal/hcalendcapalgo.xml',
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2030/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2030/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml',
@@ -74,13 +71,13 @@
         'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v1/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/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
diff --git a/Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2030/v1/muonProdCuts.xml
similarity index 100%
rename from Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml
rename to Geometry/MuonSimData/data/muonProdCuts/2030/v1/muonProdCuts.xml
diff --git a/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml
similarity index 100%
rename from Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
rename to Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml
diff --git a/Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml b/Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml
similarity index 100%
rename from Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml
rename to Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml
diff --git a/Geometry/TrackerCommonData/data/trackermaterial/2026/v1/trackermaterial.xml b/Geometry/TrackerCommonData/data/trackermaterial/2030/v1/trackermaterial.xml
similarity index 100%
rename from Geometry/TrackerCommonData/data/trackermaterial/2026/v1/trackermaterial.xml
rename to Geometry/TrackerCommonData/data/trackermaterial/2030/v1/trackermaterial.xml
diff --git a/Geometry/TrackerCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py b/Geometry/TrackerCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py
index 01c06221da807..ba119328a3af4 100644
--- a/Geometry/TrackerCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py
+++ b/Geometry/TrackerCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py
@@ -1,25 +1,22 @@
 import FWCore.ParameterSet.Config as cms
 
-# This config was generated automatically using generateRun4Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         '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/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
@@ -42,9 +39,9 @@
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
@@ -72,22 +69,22 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
-        'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
@@ -103,21 +100,21 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
         'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/v5/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
-        'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',