diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
index 0fc7f30c422f8..e7b1bbbebca3e 100644
--- a/Configuration/Geometry/python/dict2026Geometry.py
+++ b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1132,8 +1132,8 @@
             '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/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml',
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
index 8917cd6ae09ed..86038120154e4 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
@@ -54,8 +54,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
index a6f3d74be0db9..ea8d6a5d8f17e 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
@@ -54,8 +54,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
index 144011fe39bbe..54d7c0af089fa 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
@@ -53,8 +53,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
index b98d455d7e8cb..77af35b15adfe 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
@@ -55,8 +55,8 @@
         '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/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
index 3e41268955a3c..c8310ee7c738d 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
@@ -55,8 +55,8 @@
         '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/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
index ae00de8a7648c..4623dfeb053e5 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
@@ -54,8 +54,8 @@
         '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/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',