diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
index 2682b8120e2a8..cee6a031b694c 100644
--- a/Configuration/Geometry/python/dict2026Geometry.py
+++ b/Configuration/Geometry/python/dict2026Geometry.py
@@ -915,12 +915,12 @@
             '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/zdcmaterials/2021/v1/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/zdc/2021/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [
@@ -928,7 +928,7 @@
             'Geometry/ForwardSimData/data/zdcsens.xml',
         ],
         4 : [
-            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
             'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         ],
         "reco" :[
@@ -940,12 +940,12 @@
             'Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml',
             'Geometry/ForwardCommonData/data/brmrotations.xml',
             'Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml',
-            'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-            'Geometry/ForwardCommonData/data/zdclumi.xml',
+            'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [
@@ -953,7 +953,7 @@
             'Geometry/ForwardSimData/data/zdcsens.xml',
         ],
         4 : [
-            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
             'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         ],
         "sim" : [
@@ -967,12 +967,12 @@
             'Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml',
             'Geometry/ForwardCommonData/data/brmrotations.xml',
             'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-            'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-            'Geometry/ForwardCommonData/data/zdclumi.xml',
+            'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [
@@ -980,7 +980,7 @@
             'Geometry/ForwardSimData/data/zdcsens.xml',
         ],
         4 : [
-            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
             'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         ],
         "reco" :[
@@ -992,12 +992,12 @@
             'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
             'Geometry/ForwardCommonData/data/brmrotations.xml',
             'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-            'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-            'Geometry/ForwardCommonData/data/zdclumi.xml',
+            'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [
@@ -1005,7 +1005,7 @@
             'Geometry/ForwardSimData/data/zdcsens.xml',
         ],
         4 : [
-            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
             'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         ],
         "reco" :[
@@ -1017,12 +1017,12 @@
             'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
             'Geometry/ForwardCommonData/data/brmrotations.xml',
             'Geometry/ForwardCommonData/data/brm/2026/v3/brm.xml',
-            'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-            'Geometry/ForwardCommonData/data/zdclumi.xml',
+            'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [
@@ -1030,7 +1030,7 @@
             'Geometry/ForwardSimData/data/zdcsens.xml',
         ],
         4 : [
-            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
             'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         ],
         "reco" :[
@@ -1040,19 +1040,19 @@
     "F8" : {
         1 : [
             'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
-            'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-            'Geometry/ForwardCommonData/data/zdclumi.xml',
+            'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [
             'Geometry/ForwardSimData/data/zdcsens.xml',
         ],
         4 : [
-            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
             'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         ],
         "reco" :[
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
index 49aa1c89a238c..f019219282c62 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
index f73a790675575..3c762a0490fbf 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
index c69c8ef1a7750..e1b2ade022f17 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
@@ -84,12 +84,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -118,7 +118,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml
index 263823f1accb5..4068059bbde87 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml
index 689625f7fddd0..573f70e96664b 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml
@@ -84,12 +84,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -118,7 +118,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml
index e722b91ed65dc..0a7335e14d0f0 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml
@@ -88,12 +88,12 @@
     <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/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -123,7 +123,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml
index ac1201fd7c6d7..157f71621eff2 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v2/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.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'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml
index 344a06a8de353..368f922028026 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v2/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.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'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml
index 014a6591c8b57..69fcdd1c5889e 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml
@@ -84,12 +84,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
@@ -118,7 +118,7 @@
     <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/ForwardSimData/data/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml
index 14f8a43ec189d..a4e5a9bf7d45c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v2/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.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'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml
index 2332bef2faf62..28d2768a9a943 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml
@@ -85,12 +85,12 @@
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.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.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/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'/>
     <Include ref='Geometry/MTDCommonData/data/btl/v2/btl.xml'/>
@@ -119,7 +119,7 @@
     <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/ForwardSimData/data/zdcProdCuts.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'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
index 4154669cc1009..0578be7ed66d1 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
index 684b7f9b26c28..c2fcb808ec326 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
index fc97f20da20dc..d92423f49662e 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
@@ -85,12 +85,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -121,7 +121,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py
index 88e155f015ee0..dd51e9e5075fa 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py
index 0940c5e0991f4..04dee1f727dd2 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py
@@ -85,12 +85,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -121,7 +121,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py
index c47d6aaeb0816..8d3520c36009d 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py
@@ -89,12 +89,12 @@
         '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/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -126,7 +126,7 @@
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py
index 27f1baf041ca4..daf97a448f0aa 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py
index 6baea1568f62b..d3641bf4bb37e 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py
index a4fd0b76acc6f..708002b84b6a9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py
@@ -85,12 +85,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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/v1/btl.xml',
@@ -121,7 +121,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py
index a02974352a862..2ff3d9424e7ca 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py
index 06ace5fd4ddc5..b43e0e58c52a4 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py
@@ -86,12 +86,12 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.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.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/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',
@@ -122,7 +122,7 @@
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.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',