diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index 29c2d7e5cf451..c0cd29377ac71 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1665,7 +1665,7 @@
     ("O5","T5","C1","M1","F1","P7") : "2021FlatMinus05Percent",
     ("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent",
     ("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent",
-    ("O5","T8","C1","M1","F2","P7") : "2021FlatPlus10Percent",
+    ("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent",
     ("O6","T3","C1","M2","F2","P7") : "2023",
     ("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial",
     ("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent",
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
index f205ea9dc6c7d..a404a2c98ffe2 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -261,7 +261,7 @@
     <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/2021/v3/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
index cfcbe6c78dacf..2e09535da4524 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -264,7 +264,7 @@
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',