diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalV6MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalV6MuonXML_cfi.py
index de8622bd7b9cb..379fca7fe6c8e 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalV6MuonXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalV6MuonXML_cfi.py
@@ -86,7 +86,7 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/v6/hgcal.xml',
         'Geometry/HGCalCommonData/data/v5/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v6/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/v6/hgcalCons.xml',
         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
diff --git a/Geometry/HGCalCommonData/data/v6/hgcal.xml b/Geometry/HGCalCommonData/data/v6/hgcal.xml
index be77279761c57..de8e578cd93d2 100644
--- a/Geometry/HGCalCommonData/data/v6/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/v6/hgcal.xml
@@ -15,8 +15,8 @@
   <Constant name="rMaxHGCal3"  value="([rMaxHGCal2]+(([zHGCal3]-[zHGCal2])*[slope3]))"/>
   <Constant name="rMaxHGCal4"  value="2458.0*mm"/>
   <Constant name="zHGCal4"     value="4870.85*mm"/>
-  <Constant name="zHGCal44"    value="4100.00*mm"/>
-  <Constant name="zHGCal45"    value="4175.00*mm"/>
+  <Constant name="zHGCal44"    value="4109.85*mm"/>
+  <Constant name="zHGCal45"    value="[zHGCal3]"/>
   <Constant name="zMinEE"      value="[zHGCal1]"/>
   <Constant name="zMaxEE"      value="3488.85*mm"/>
   <Constant name="zMinHE"      value="[zMaxEE]"/>
diff --git a/Geometry/HGCalCommonData/data/v6/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/v6/hgcalHEsil.xml
new file mode 100644
index 0000000000000..7e516d9cdb5fc
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/v6/hgcalHEsil.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalHEsil.xml" eval="true">
+  <Constant name="ZmaxHEsil" value="4109.85*mm"/>
+  <Constant name="rMinHEsil" value="[etaMax:slope]*[ZmaxHEsil]"/>
+  <Constant name="rMaxHEsil" value="[hgcal:rMaxHGCal2]"/>
+  <Constant name="rMapHEsil" value="[rMaxHEsil]*[hgcal:factor1]"/>
+</ConstantsSection> 
+
+<SolidSection label="hgcalHEsil.xml">
+ <Polyhedra name="HGCalHESilicon" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
+  <ZSection z="[hgcal:zMinHE]"  rMin="[hgcal:rMinHEMin]"  rMax="[hgcal:rMapHEMin]"/>
+  <ZSection z="[hgcal:zHGCal2]" rMin="[hgcal:rMinHGCal2]" rMax="[hgcal:rMapHGCal2]"/>
+  <ZSection z="[ZmaxHEsil]"     rMin="[rMinHEsil]"        rMax="[rMapHEsil]"/>
+ </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcalHEsil.xml">
+ <LogicalPart name="HGCalHESilicon" category="unspecified">
+  <rSolid name="HGCalHESilicon"/>
+  <rMaterial name="materials:Air"/>
+ </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalHEsil.xml">
+ <Algorithm name="global:DDAngular">
+  <rParent name="hgcal:HGCalHE"/>
+  <String name="ChildName"    value="HGCalHESilicon"/>
+  <Numeric name="StartCopyNo" value="1"/>
+  <Numeric name="IncrCopyNo"  value="1"/>
+  <Numeric name="N"           value="18"/>
+  <Numeric name="StartAngle"  value="0*deg"/>
+  <Numeric name="RangeAngle"  value="360*deg"/>
+  <Numeric name="Radius"      value="0*m"/>
+  <Vector name="Center" type="numeric" nEntries="3"> 0, 0, 0 </Vector>
+  <Vector name="RotateSolid" type="numeric" nEntries="3"> 0.*deg, 0.*deg, 0.*deg </Vector>
+ </Algorithm>
+ <Algorithm name="hgcal:DDHGCalEEAlgo">
+  <rParent name="hgcalHEsil:HGCalHESilicon"/>
+  <Vector name="MaterialNames" type="string" nEntries="11">
+   materials:H_Brass, materials:Lead, materials:Copper, materials:Copper, 
+   materials:Silicon, materials:M_NEMA FR4 plate, materials:Air, 
+   materials:StainlessSteel, materials:Foam, materials:Aluminium, materials:Air</Vector>
+  <Vector name="VolumeNames" type="string" nEntries="11">
+   HESiliconAbsorber1, HESiliconAbsorber2, HESiliconShield, HESiliconHeatShield,
+   HESiliconSensitive, HESiliconPCB,       HESiliconAirGap, HESiliconSupport,
+   HEThermalScreen, HEScreenCover, HEThermalGap</Vector>
+  <Vector name="Thickness" type="numeric" nEntries="11">
+   40.0*mm, 1.0*mm, 0.5*mm, 3.0*mm, 0.1*mm, 1.2*mm, 2.0*mm, 15*mm, 16.0*mm, 2.0*mm, 10.0*mm</Vector>
+  <String name="Rotation" value="rotations:YXZ4"/>
+  <Vector name="LayerType" type="numeric" nEntries="113"> 7,
+   0, 2, 6, 5, 4, 4, 4, 3, 1, 0, 2, 6, 5, 4, 4, 4, 3, 1,
+   0, 2, 6, 5, 4, 4, 4, 3, 1, 0, 2, 6, 5, 4, 4, 4, 3, 1,
+   0, 2, 6, 5, 4, 4, 4, 3, 1, 0, 2, 6, 5, 4, 4, 4, 3, 1,
+   0, 2, 6, 5, 4, 4, 4, 3, 1, 0, 2, 6, 5, 4, 4, 4, 3, 1,
+   0, 2, 6, 5, 4, 4, 4, 3, 1, 0, 2, 6, 5, 4, 4, 4, 3, 1,
+   0, 2, 6, 5, 4, 4, 4, 3, 1, 0, 2, 6, 5, 4, 4, 4, 3, 1, 10, 9, 8, 9 </Vector>
+  <Vector name="HeightType" type="numeric" nEntries="113"> 0,
+   0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1</Vector>
+  <Vector name="LayerThick" type="numeric" nEntries="113"> 
+   15.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm, 48.0*mm,
+   30.0*mm, 30.0*mm, 30.0*mm, 30.0*mm </Vector>
+  <Numeric name="zMinBlock"   value="[hgcal:zMinHE]"/>
+  <Numeric name="Sectors"     value="18"/>
+  <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], 0, 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal4]</Vector>
+ </Algorithm>
+</PosPartSection>
+
+<SpecParSection label="hgcalHEsil.xml" eval="true">
+  <SpecPar name="HGCalHESilicon">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+    <Parameter name="Granularity" value="9.5*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml b/Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml
index c3bb3bbc2e0b0..4227197bc841d 100644
--- a/Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml
+++ b/Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml
@@ -6,24 +6,23 @@
   <Constant name="slopeTopF"   value="tan(2.0*atan(exp(-[etaMinF])))"/>
   <Constant name="slopeTop"    value="tan(53.0*deg)"/>
   <Constant name="zShiftHE"    value="-23.92*mm"/>
-  <Constant name="z1Beam"      value="2412.7*mm"/>
   <Constant name="rMaxHECal2"  value="2639.0*mm"/>
-  <Constant name="rMaxHECal3"  value="2459.0*mm"/>
-#  <Constant name="zHECal1"     value="4181.5*mm"/>
+  <Constant name="rMaxHECal3"  value="2458.0*mm"/>
   <Constant name="zHECal1"     value="[hgcal:zHGCal3]"/>
-  <Constant name="rMaxHECal1"  value="([zHECal1]-[z1Beam])*[slopeTop]"/>
-  <Constant name="zHECal5"     value="5242.5*mm"/>
-  <Constant name="zHECal4"     value="([zHECal5]-15.0*mm)"/>
-  <Constant name="zHECal3"     value="([zHECal4]-348.0*mm)"/>
-  <Constant name="zHECal2"     value="(([rMaxHECal2]/[slopeTop])+[z1Beam])"/>
-  <Constant name="zHECalP3"    value="([zHECal1]+174.0*mm)"/>    
+  <Constant name="zHECal2"     value="([zHECal1]+348.0*mm)"/>
+  <Constant name="zHECal3"     value="([zHECal2]+348.0*mm)"/>
+  <Constant name="zHECal4"     value="([zHECal3]+348.0*mm)"/>
+  <Constant name="zHECal5"     value="([zHECal4]+15.0*mm)"/>
+  <Constant name="zHECalP3"    value="([zHECal1]+174.0*mm)"/>
+  <Constant name="z1Beam"      value="([zHECal2]-([rMaxHECal2]/[slopeTop]))"/>
+  <Constant name="rMaxHECal1" value="([zHECal1]-[z1Beam])*[slopeTop]"/>
+  <Constant name="rMaxHECalP3" value="([zHECalP3]-[z1Beam])*[slopeTop]"/>
   <Constant name="rMinHECal1"  value="[etaMax:slope]*[zHECal1]"/>
   <Constant name="rMinHECal2"  value="[etaMax:slope]*[zHECal2]"/>
   <Constant name="rMinHECal3"  value="[etaMax:slope]*[zHECal3]"/>    
   <Constant name="rMinHECal4"  value="[etaMax:slope]*[zHECal4]"/>
   <Constant name="rMinHECal5"  value="[etaMax:slope]*[zHECal5]"/>
   <Constant name="rMinHECalP3" value="[etaMax:slope]*[zHECalP3]"/>
-  <Constant name="rMaxHECalP3" value="([zHECalP3]-[z1Beam])*[slopeTop]"/>
 </ConstantsSection>
 
 <SolidSection label="hcalendcapalgo.xml">