diff --git a/Geometry/HGCalCommonData/data/TB160/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB160/hgcalCons.xml
index 99ba78055eef7..643d0c559b41f 100644
--- a/Geometry/HGCalCommonData/data/TB160/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB160/hgcalCons.xml
@@ -269,6 +269,7 @@
     <Parameter name="GroupingZOut"   value="28"/>
     <Parameter name="GroupingZOut"   value="28"/>
     <Parameter name="GroupingZOut"   value="28"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml
index 0ee0307d91276..5f23696c805c0 100644
--- a/Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml
@@ -26,6 +26,7 @@
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml
index 005de5fa86b38..11b4d664aae4c 100644
--- a/Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml
@@ -89,6 +89,7 @@
     <Parameter name="GroupingZOut"   value="-1"/>
     <Parameter name="GroupingZOut"   value="8"/>
     <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml
index 52520904a1b9e..5c06aeecfb084 100644
--- a/Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml
@@ -26,6 +26,7 @@
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml
index 54b8bbbfc939b..ab8f59ed24632 100644
--- a/Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml
@@ -55,6 +55,7 @@
     <Parameter name="GroupingZOut"  value="3"/>
     <Parameter name="GroupingZOut"  value="3"/>
     <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="LayerOffset"   value="0"/>
   </SpecPar>
   <SpecPar name="HGCalHESiliconSensitive">
     <PartSelector path="//HGCalHESiliconSensitive.*"/>
@@ -96,6 +97,7 @@
     <Parameter name="GroupingZOut"   value="4"/>
     <Parameter name="GroupingZOut"   value="4"/>
     <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="LayerOffset"    value="3"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml
index dbc6c6c0b428a..f95d4a1bce871 100644
--- a/Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml
@@ -186,6 +186,7 @@
     <Parameter name="GroupingZOut"   value="10"/>
     <Parameter name="GroupingZOut"   value="10"/>
     <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB170/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB170/hgcalCons.xml
index 45e8153986ab7..df259eec18e51 100644
--- a/Geometry/HGCalCommonData/data/TB170/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB170/hgcalCons.xml
@@ -280,6 +280,7 @@
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
   <SpecPar name="HGCalHESiliconSensitive">
     <PartSelector path="//HGCalHESiliconSensitive.*"/>
@@ -393,6 +394,7 @@
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="28"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB180/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB180/hgcalCons.xml
index 5335bf89d3465..2cb30b13d0d12 100644
--- a/Geometry/HGCalCommonData/data/TB180/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB180/hgcalCons.xml
@@ -44,6 +44,7 @@
     <Parameter name="GroupingZOut"   value="3"/>
     <Parameter name="GroupingZOut"   value="3"/>
     <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml
index 5163725219870..ba51916be6f54 100644
--- a/Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml
@@ -269,6 +269,7 @@
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"   value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml
index ecadaa8121088..b6c5cc7366cb5 100644
--- a/Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml
@@ -280,6 +280,7 @@
     <Parameter name="GroupingZOut"  value="-1"/>
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"   value="0"/>
   </SpecPar>
   <SpecPar name="HGCalHESiliconSensitive">
     <PartSelector path="//HGCalHESiliconSensitive.*"/>
@@ -393,6 +394,7 @@
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="28"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml
index a77f0842fe086..0ab8ca982a0a0 100644
--- a/Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml
@@ -125,6 +125,7 @@
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py
deleted file mode 100644
index a1affc140313f..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py
+++ /dev/null
@@ -1,117 +0,0 @@
-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/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2019/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/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/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/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/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/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/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v7/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v7/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v1/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_BaseLine/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_BaseLine/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2015/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',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_BaseLine/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/HGCal/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/hgcsensv6.xml',
-        'Geometry/HGCalSimData/data/hgccons.xml',
-        'Geometry/HGCalSimData/data/hgcProdCuts.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/PhaseII/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py
deleted file mode 100644
index 8a1ba3ec7a489..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py
+++ /dev/null
@@ -1,120 +0,0 @@
-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/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/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/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/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/TiltedTracker404/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/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/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/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/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v8/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/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/me0/TDR_Dev/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',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/HGCal/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/hgcsensv8.xml',
-        'Geometry/HGCalSimData/data/hgccons.xml',
-        'Geometry/HGCalSimData/data/hgcProdCuts.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/PhaseII/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
index 75019519e3495..c0e060b3d5d87 100644
--- a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
+++ b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
@@ -1173,6 +1173,11 @@ void HGCalGeomParameters::loadSpecParsHexagon(const DDFilteredView& fv,
   php.layerGroupM_ = dbl_to_int(getDDDArray("GroupingZMid", sv, 0));
   php.layerGroupO_ = dbl_to_int(getDDDArray("GroupingZOut", sv, 0));
   php.slopeMin_ = getDDDArray("Slope", sv, 1);
+  const auto& dummy2 = getDDDArray("LayerOffset", sv, 0);
+  if (!dummy2.empty())
+    php.layerOffset_ = dummy2[0];
+  else
+    php.layerOffset_ = 0;
 
   // Wafer size
   std::string attribute = "Volume";
@@ -1223,6 +1228,14 @@ void HGCalGeomParameters::loadSpecParsHexagon(const cms::DDFilteredView& fv,
   php.cellSize_ = fv.get<std::vector<double> >(sdTag3, "CellSize");
   rescale(php.cellSize_, HGCalParameters::k_ScaleFromDD4hepToG4);
 
+  // Layer Offset
+  const auto& dummy2 = fv.get<std::vector<double> >(sdTag1, "LayerOffset");
+  if (!dummy2.empty()) {
+    php.layerOffset_ = dummy2[0];
+  } else {
+    php.layerOffset_ = 0;
+  }
+
   loadSpecParsHexagon(php);
 }
 
@@ -1242,6 +1255,8 @@ void HGCalGeomParameters::loadSpecParsHexagon(const HGCalParameters& php) {
   edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: " << php.cellSize_.size() << " cells of sizes:";
   for (unsigned int k = 0; k < php.cellSize_.size(); ++k)
     edm::LogVerbatim("HGCalGeom") << " [" << k << "] " << php.cellSize_[k];
+  edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: First Layer " << php.firstLayer_ << " and layer offset "
+                                << php.layerOffset_;
 #endif
 }