diff --git a/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml
index d9c94655c266f0..540a37532e012a 100644
--- a/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml
@@ -103,7 +103,7 @@ Git: 0.9-fall2024-231-gf50161121
     <attribute code="0x0000" side="server" define="SUPPORTED_ZONE_SOURCES" type="array" entryType="ZoneSourceEnum">SupportedZoneSources</attribute>
     <attribute code="0x0001" side="server" define="ZONES" type="array" entryType="ZoneInformationStruct" optional="true">Zones</attribute>
     <attribute code="0x0002" side="server" define="TIME_CONTROL" type="array" entryType="ZoneTriggeringTimeControlStruct" writable="true">TimeControl</attribute>
-    <attribute code="0x0003" side="server" define="SENSITIVITY" type="int8u" min="18446744073709551607" max="18446744073709551607" default="5" writable="true">Sensitivity</attribute>
+    <attribute code="0x0003" side="server" define="SENSITIVITY" type="int8u" min="1" max="10" default="5" writable="true">Sensitivity</attribute>
     <command code="0x00" source="client" name="CreateTwoDCartesianZone" optional="true">
       <description>This command SHALL create and store a TwoD Cartesian Zone.</description>
       <access op="invoke" privilege="manage"/>
@@ -140,13 +140,13 @@ Git: 0.9-fall2024-231-gf50161121
     </command>
 
     <event code="0x0000" name="ZoneTriggered" priority="info" side="server">
-      <field id="0" name="Zones" array="true" type="ZoneID"/>
+      <field id="0" name="Zones" array="true" type="int16u"/>
       <field id="1" name="Reason" type="ZoneEventTriggeredReasonEnum" min="0x00" max="0x00"/>
       <description>This event SHALL be generated when a Zone is first triggered.</description>
     </event>
 
     <event code="0x0001" name="ZoneStopped" priority="info" side="server">
-      <field id="0" name="Zones" array="true" type="ZoneID"/>
+      <field id="0" name="Zones" array="true" type="int16u"/>
       <field id="1" name="Reason" type="ZoneEventStoppedReasonEnum" min="0x00" max="0x01"/>
       <description>This event SHALL be generated when either when the TriggerDetectedDuration value is exceeded by the TimeSinceInitialTrigger value or when the MaxDuration value is exceeded by the TimeSinceInitialTrigger value as described in  ZoneTriggeringTimeControlStruct.</description>
     </event>