diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index fba8045abba478..8790aa3df77f70 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3648,7 +3648,7 @@ cluster SmokeCoAlarm = 92 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 cluster DishwasherAlarm = 93 {
-  revision 1; // NOTE: Default/not specifically set
+  revision 1;
 
   bitmap AlarmBitmap : bitmap32 {
     kInflowError = 0x1;
@@ -3689,9 +3689,9 @@ cluster DishwasherAlarm = 93 {
     AlarmBitmap mask = 0;
   }
 
-  /** Reset alarm */
+  /** This command resets active and latched alarms (if possible). */
   command Reset(ResetRequest): DefaultSuccess = 0;
-  /** Modify enabled alarms */
+  /** This command allows a client to request that an alarm be enabled or suppressed at the server. */
   command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
 }
 
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index e9d64f8d227d59..989a4d0a5a8d18 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -1512,7 +1512,7 @@ cluster DishwasherMode = 89 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 cluster DishwasherAlarm = 93 {
-  revision 1; // NOTE: Default/not specifically set
+  revision 1;
 
   bitmap AlarmBitmap : bitmap32 {
     kInflowError = 0x1;
@@ -1553,9 +1553,9 @@ cluster DishwasherAlarm = 93 {
     AlarmBitmap mask = 0;
   }
 
-  /** Reset alarm */
+  /** This command resets active and latched alarms (if possible). */
   command Reset(ResetRequest): DefaultSuccess = 0;
-  /** Modify enabled alarms */
+  /** This command allows a client to request that an alarm be enabled or suppressed at the server. */
   command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
 }
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
index f460f42a1971ae..5063758018f05a 100644
--- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2023 Project CHIP Authors
+Copyright (c) 2023-2025 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,71 +14,68 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<configurator>
+<!--
+XML generated by Alchemy; DO NOT EDIT.
+Source: src/app_clusters/DishwasherAlarm.adoc
+Parameters: in-progress 
+Git: 
+-->
+<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
-
   <bitmap name="AlarmBitmap" type="bitmap32">
-     <cluster code="0x005D" />
-     <field name="InflowError"           mask="0x01"/>
-     <field name="DrainError"            mask="0x02"/>
-     <field name="DoorError"             mask="0x04"/>
-     <field name="TempTooLow"            mask="0x08"/>
-     <field name="TempTooHigh"           mask="0x10"/>
-     <field name="WaterLevelError"       mask="0x20"/>
+    <cluster code="0x005D"/>
+    <field name="InflowError" mask="0x01"/>
+    <field name="DrainError" mask="0x02"/>
+    <field name="DoorError" mask="0x04"/>
+    <field name="TempTooLow" mask="0x08"/>
+    <field name="TempTooHigh" mask="0x10"/>
+    <field name="WaterLevelError" mask="0x20"/>
   </bitmap>
-  
+
   <cluster>
     <name>Dishwasher Alarm</name>
     <domain>Appliances</domain>
     <description>Attributes and commands for configuring the Dishwasher alarm.</description>
     <code>0x005D</code>
     <define>DISHWASHER_ALARM_CLUSTER</define>
-
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
-
+    <globalAttribute code="0xFFFD" side="either" value="1"/>
     <features>
       <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
         <optionalConform/>
       </feature>
     </features>
-
-    <attribute side="server" code="0x0000" name="Mask" define="MASK" type="AlarmBitmap" default="0">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0001" name="Latch" define="LATCH" type="AlarmBitmap" default="0" optional="true">
+    <attribute side="server" code="0x0000" name="Mask" define="MASK" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">Mask</attribute>
+    <attribute side="server" code="0x0001" name="Latch" define="LATCH" type="AlarmBitmap" default="0" optional="true" min="0x00000000" max="0x0000003F">
+      <description>Latch</description>
       <mandatoryConform>
         <feature name="RESET"/>
       </mandatoryConform>
     </attribute>
-    <attribute side="server" code="0x0002" name="State" define="STATE" type="AlarmBitmap" default="0">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0003" name="Supported" define="SUPPORTED" type="AlarmBitmap" default="0">
-      <mandatoryConform/>
-    </attribute>
-
+    <attribute side="server" code="0x0002" name="State" define="STATE" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">State</attribute>
+    <attribute side="server" code="0x0003" name="Supported" define="SUPPORTED" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">Supported</attribute>
     <command source="client" code="0x00" name="Reset" optional="true">
-      <description>Reset alarm</description>
-      <arg name="Alarms" type="AlarmBitmap" optional="false"/>
+      <description>This command resets active and latched alarms (if possible).</description>
+      <arg id="0" name="Alarms" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
       <mandatoryConform>
         <feature name="RESET"/>
       </mandatoryConform>
     </command>
 
     <command source="client" code="0x01" name="ModifyEnabledAlarms" optional="true">
-      <description>Modify enabled alarms</description>
-      <arg name="Mask" type="AlarmBitmap" optional="false"/>
+      <description>This command allows a client to request that an alarm be enabled or suppressed at the server.</description>
+      <arg id="0" name="Mask" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
       <optionalConform/>
     </command>
 
-    <event side="server" code="0x00" priority="info" name="Notify" optional="false">
-      <description>Notify</description>
-      <field id="0" name="Active" type="AlarmBitmap"/>
-      <field id="1" name="Inactive" type="AlarmBitmap"/>
-      <field id="2" name="State" type="AlarmBitmap"/>
-      <field id="3" name="Mask" type="AlarmBitmap"/>
-      <mandatoryConform/>
+    <event side="server" code="0x00" priority="info" name="Notify">
+      <description>This event SHALL be generated when one or more alarms change state, and SHALL have these fields: </description>
+      <field id="0" name="Active" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
+      <field id="1" name="Inactive" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
+      <field id="2" name="State" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
+      <field id="3" name="Mask" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
     </event>
+
   </cluster>
 </configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index d166b45a88a7ae..ebf26041ff12b6 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -3866,7 +3866,7 @@ cluster SmokeCoAlarm = 92 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 cluster DishwasherAlarm = 93 {
-  revision 1; // NOTE: Default/not specifically set
+  revision 1;
 
   bitmap AlarmBitmap : bitmap32 {
     kInflowError = 0x1;
@@ -3907,9 +3907,9 @@ cluster DishwasherAlarm = 93 {
     AlarmBitmap mask = 0;
   }
 
-  /** Reset alarm */
+  /** This command resets active and latched alarms (if possible). */
   command Reset(ResetRequest): DefaultSuccess = 0;
-  /** Modify enabled alarms */
+  /** This command allows a client to request that an alarm be enabled or suppressed at the server. */
   command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
 }
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 929db36d9413b7..6d975994025b95 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -5578,13 +5578,13 @@ MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4))
 /**
  * Command Reset
  *
- * Reset alarm
+ * This command resets active and latched alarms (if possible).
  */
 - (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 /**
  * Command ModifyEnabledAlarms
  *
- * Modify enabled alarms
+ * This command allows a client to request that an alarm be enabled or suppressed at the server.
  */
 - (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));