diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index eaafd36577a64..afd225727c7db 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -109,6 +109,7 @@ Calorimeters:
 * C22: HGCal (v18 version of HGCal geometry as in C18 with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D104)
 * C23: HGCal (same as the v18 version which is in C22 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106)
 * C24: HGCal (v18 version of HGCal geometry as in C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
+* C25: sane as C18 but changing ebalgo.xml to make it more conformant with standard
 
 Muon system:
 * M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
@@ -118,6 +119,7 @@ Muon system:
 * M9: same as M8 with GE0 replacing ME0
 * M10: same as M9 but with a realistic support structure for GE0, Shield structure modified in muonYoke
 * M11: same as M10 but with a corrected eta partition sizes for GE21
+* M12: same as M11 but removing overlaps in yoke, MB3, GE0 + adding DT shield
 
 Fast Timing system:
 * I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments
@@ -136,6 +138,7 @@ The script also handles the common and forward elements of the geometry:
 * O7: same as O6 with changes needed for new defintion of calorimeter boundaries
 * O8: same as O7 with changes needed for a newer definition of calorimeter boundaries
 * O9: same as O8 with changes needed to support the additional notch in ETL
+*O10: same as O9 with changes needed to support the shields for DT
 
 * F2: modifications needed to accommodate detailed cavern, ZDC description is removed.
 * F3: same as F2 but changes due to HFNose
@@ -144,6 +147,7 @@ The script also handles the common and forward elements of the geometry:
 * F6: same as F4 with modifications needed for BRM and forward shield
 * F7: same as F6 with modifications needed for HFNose
 * F8: same as F6 or F7 without BRM
+* F9: same as F8 after removing overlap in rotated shield
 
 Several detector combinations have been generated:
 * D95 = T31+C17+M10+I16+O9+F8
@@ -165,4 +169,6 @@ Several detector combinations have been generated:
 * D112 = T37+C24+M11+I17+O9+F8
 * D113 = T38+C24+M11+I17+O9+F8
 * D114 = T39+C19+M11+I17+O9+F8
+* D115 = T35+C20+M11+I17+O9+F8 
+* D116 = T35+C25+M12+I17+O10+F9
 
diff --git a/Configuration/Geometry/python/dictRun4Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py
index c517a0242cda0..b91b48f4f8c22 100644
--- a/Configuration/Geometry/python/dictRun4Geometry.py
+++ b/Configuration/Geometry/python/dictRun4Geometry.py
@@ -58,6 +58,34 @@
         ],
         "era" : "phase2_common, phase2_trigger",
     },
+    "O10" : {
+        1 : [
+            'Geometry/CMSCommonData/data/materials/2030/v1/materials.xml',
+            'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.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/cmsMother.xml',
+            'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+            'Geometry/CMSCommonData/data/cmsTracker.xml',
+            'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
+            'Geometry/CMSCommonData/data/cmsCalo.xml',
+            'Geometry/CMSCommonData/data/muonBase/2026/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/muonMB.xml',
+            'Geometry/CMSCommonData/data/muonMagnet.xml',
+            'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+            'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        ],
+        5 : [
+            'Geometry/CMSCommonData/data/FieldParameters.xml',
+        ],
+        "era" : "phase2_common, phase2_trigger",
+    },
 }
 
 trackerDict = {
@@ -1293,7 +1321,7 @@
             'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
             'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
             'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
-            'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.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/csc/2021/v2/csc.xml',
@@ -1528,7 +1556,7 @@
     ("O9","T38","C24","M11","F8","I17") : "D113",
     ("O9","T39","C19","M11","F8","I17") : "D114",
     ("O9","T35","C20","M11","F8","I17") : "D115",
-    ("O9","T35","C25","M12","F9","I17") : "D116",
+    ("O10","T35","C25","M12","F9","I17") : "D116",
 }
 
 deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"])
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml
index ae6f3ba4dcf7e..0e3cf107d8d00 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml
@@ -4,7 +4,8 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/materials/2030/v1/materials.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
@@ -70,7 +71,7 @@
     <Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
     <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/2021/v1/mb4Shield.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/csc/2021/v2/csc.xml'/>
diff --git a/Geometry/CMSCommonData/data/materials/2030/v1/materials.xml b/Geometry/CMSCommonData/data/materials/2030/v1/materials.xml
index 0cae172e93e86..02db5c952a256 100644
--- a/Geometry/CMSCommonData/data/materials/2030/v1/materials.xml
+++ b/Geometry/CMSCommonData/data/materials/2030/v1/materials.xml
@@ -3744,6 +3744,17 @@
     <rMaterial name="materials:Hydrogen"/>
    </MaterialFraction>
   </CompositeMaterial>
+  <CompositeMaterial name="T_Kapton" density="1.4*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.59985105">
+    <rMaterial name="materials:Carbon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.080541353">
+    <rMaterial name="materials:Hydrogen"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.31960759">
+    <rMaterial name="materials:Oxygen"/>
+   </MaterialFraction>
+  </CompositeMaterial>
   <CompositeMaterial name="T_MSGC-Average" density="230*mg/cm3" symbol=" " method="mixture by weight">
    <MaterialFraction fraction="0.8">
     <rMaterial name="materials:Carbon"/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py
index 7c982eb460434..21de4ae69e0a8 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py
@@ -5,7 +5,8 @@
 
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
+        'Geometry/CMSCommonData/data/materials/2030/v1/materials.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
         'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
@@ -71,7 +72,7 @@
         'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
         'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
-        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.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/csc/2021/v2/csc.xml',