diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml
index 292067d12aa456..7a1ff4eea65cf2 100644
--- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-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,9 +14,14 @@ 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/BooleanState.adoc
+Parameters: in-progress 
+Git: 
+-->
+<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
-
   <cluster>
     <name>Boolean State</name>
     <domain>General</domain>
@@ -26,14 +31,12 @@ limitations under the License.
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
     <globalAttribute side="either" code="0xFFFD" value="1"/>
-    <attribute side="server" code="0x0000" name="StateValue" define="STATE_VALUE" type="boolean" reportable="true">
-      <mandatoryConform/>
-    </attribute>
-    
-    <event code="0x0000" name="StateChange" priority="info" side="server">
-      <description>This event SHALL be generated when the StateValue attribute changes.</description>
+    <attribute side="server" code="0x0000" name="StateValue" define="STATE_VALUE" type="boolean">StateValue</attribute>
+    <event code="0x0000" name="StateChange" priority="info" side="server" optional="true">
+      <description>If this event is supported, it SHALL be generated when the StateValue attribute changes.</description>
       <field id="0" name="StateValue" type="boolean"/>
       <optionalConform/>
     </event>
+
   </cluster>
 </configurator>
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index 23ecde30a04c19..2eb53f9c9758cc 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -145,7 +145,7 @@
     "ServerDirectories": {
         "ACCESS_CONTROL_CLUSTER": ["access-control-server"],
         "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"],
-        "ACTIONS_CLUSTER": [],
+        "ACTIONS_CLUSTER": ["actions-server"],
         "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [
             "resource-monitoring-server"
         ],
@@ -330,7 +330,6 @@
         "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
         "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
         "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"],
-        "ZONE_MANAGEMENT_CLUSTER": [],
-        "ACTIONS_CLUSTER": ["actions-server"]
+        "ZONE_MANAGEMENT_CLUSTER": []
     }
 }