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 8790aa3df77f70..1da37a2ac8a4cb 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
@@ -5300,7 +5300,7 @@ cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 1ad6b719f2e140..c12100f4b94ccf 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -3712,7 +3712,7 @@ cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter
index c33f70e684c356..77d966b425c96a 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -1326,7 +1326,7 @@ cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
index 7f3eca45b17441..d8d492a5fac623 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -1326,7 +1326,7 @@ cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 5925f477fa182e..984b2be730bec4 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -5022,7 +5022,7 @@ cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index d06ccd4d1dfe94..631c085f9859f0 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -4979,7 +4979,7 @@ cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 42714e7c00ac50..0eb8dfb172d6d0 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -1766,7 +1766,7 @@ cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
index b498bc053551ee..72f0ab1ad77047 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -1766,7 +1766,7 @@ cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
index b498bc053551ee..72f0ab1ad77047 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -1766,7 +1766,7 @@ cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index b702b5e4213fec..2d8e863a9ded55 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -1641,7 +1641,7 @@ cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
index 8e2e0ca373a86c..73a26d8d771018 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
@@ -50,10 +50,6 @@
     /* Cluster: Energy Preference, Attribute: CurrentEnergyBalance, Privilege: view */ \
     /* Cluster: Energy Preference, Attribute: CurrentLowPowerModeSensitivity, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
@@ -93,10 +89,6 @@
     /* Cluster: Energy Preference, Attribute: CurrentEnergyBalance, Privilege: view */ \
     /* Cluster: Energy Preference, Attribute: CurrentLowPowerModeSensitivity, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
@@ -136,10 +128,6 @@
     /* Cluster: Energy Preference, Attribute: CurrentEnergyBalance, Privilege: view */ \
     /* Cluster: Energy Preference, Attribute: CurrentLowPowerModeSensitivity, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
-    /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
index 0158c4077da4d3..5432e94b31ac90 100644
--- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-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,7 +14,13 @@ 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/PumpConfigurationControl.adoc
+Parameters: in-progress 
+Git: 
+-->
+<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="CHIP"/>
   <cluster>
     <name>Pump Configuration and Control</name>
@@ -24,23 +30,22 @@ limitations under the License.
     <define>PUMP_CONFIGURATION_AND_CONTROL_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" tickFrequency="half" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="3"/>
-
+    <globalAttribute side="either" code="0xFFFD" value="4"/>
     <features>
       <feature bit="0" code="PRSCONST" name="ConstantPressure" summary="Supports operating in constant pressure mode">
-        <optionalConform choice="a" more="true"/>
+        <optionalConform choice="a" more="true" min="1"/>
       </feature>
       <feature bit="1" code="PRSCOMP" name="CompensatedPressure" summary="Supports operating in compensated pressure mode">
-        <optionalConform choice="a" more="true"/>
+        <optionalConform choice="a" more="true" min="1"/>
       </feature>
       <feature bit="2" code="FLW" name="ConstantFlow" summary="Supports operating in constant flow mode">
-        <optionalConform choice="a" more="true"/>
+        <optionalConform choice="a" more="true" min="1"/>
       </feature>
       <feature bit="3" code="SPD" name="ConstantSpeed" summary="Supports operating in constant speed mode">
-        <optionalConform choice="a" more="true"/>
+        <optionalConform choice="a" more="true" min="1"/>
       </feature>
       <feature bit="4" code="TEMP" name="ConstantTemperature" summary="Supports operating in constant temperature mode">
-        <optionalConform choice="a" more="true"/>
+        <optionalConform choice="a" more="true" min="1"/>
       </feature>
       <feature bit="5" code="AUTO" name="Automatic" summary="Supports operating in automatic mode">
         <optionalConform/>
@@ -49,17 +54,11 @@ limitations under the License.
         <optionalConform/>
       </feature>
     </features>
-    
-    <attribute side="server" code="0x0000" name="MaxPressure" define="MAX_PRESSURE" type="int16s" isNullable="true">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0001" name="MaxSpeed" define="MAX_SPEED" type="int16u" isNullable="true">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0002" name="MaxFlow" define="MAX_FLOW" type="int16u" isNullable="true">
-      <mandatoryConform/>
-    </attribute>
+    <attribute side="server" code="0x0000" name="MaxPressure" define="MAX_PRESSURE" type="int16s" isNullable="true">MaxPressure</attribute>
+    <attribute side="server" code="0x0001" name="MaxSpeed" define="MAX_SPEED" type="int16u" isNullable="true">MaxSpeed</attribute>
+    <attribute side="server" code="0x0002" name="MaxFlow" define="MAX_FLOW" type="int16u" isNullable="true">MaxFlow</attribute>
     <attribute side="server" code="0x0003" name="MinConstPressure" define="MIN_CONST_PRESSURE" type="int16s" isNullable="true" optional="true">
+      <description>MinConstPressure</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="PRSCONST"/>
@@ -70,6 +69,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x0004" name="MaxConstPressure" define="MAX_CONST_PRESSURE" type="int16s" isNullable="true" optional="true">
+      <description>MaxConstPressure</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="PRSCONST"/>
@@ -80,6 +80,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x0005" name="MinCompPressure" define="MIN_COMP_PRESSURE" type="int16s" isNullable="true" optional="true">
+      <description>MinCompPressure</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="PRSCOMP"/>
@@ -90,6 +91,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x0006" name="MaxCompPressure" define="MAX_COMP_PRESSURE" type="int16s" isNullable="true" optional="true">
+      <description>MaxCompPressure</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="PRSCOMP"/>
@@ -100,6 +102,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x0007" name="MinConstSpeed" define="MIN_CONST_SPEED" type="int16u" isNullable="true" optional="true">
+      <description>MinConstSpeed</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="SPD"/>
@@ -110,6 +113,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x0008" name="MaxConstSpeed" define="MAX_CONST_SPEED" type="int16u" isNullable="true" optional="true">
+      <description>MaxConstSpeed</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="SPD"/>
@@ -120,6 +124,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x0009" name="MinConstFlow" define="MIN_CONST_FLOW" type="int16u" isNullable="true" optional="true">
+      <description>MinConstFlow</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="FLW"/>
@@ -130,6 +135,7 @@ limitations under the License.
       </otherwiseConform>
     </attribute>
     <attribute side="server" code="0x000A" name="MaxConstFlow" define="MAX_CONST_FLOW" type="int16u" isNullable="true" optional="true">
+      <description>MaxConstFlow</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="FLW"/>
@@ -139,7 +145,8 @@ limitations under the License.
         </optionalConform>
       </otherwiseConform>
     </attribute>
-    <attribute side="server" code="0x000B" name="MinConstTemp" define="MIN_CONST_TEMP" type="int16s" isNullable="true" min="0x954D" optional="true">
+    <attribute side="server" code="0x000B" name="MinConstTemp" define="MIN_CONST_TEMP" type="int16s" isNullable="true" min="-27315" optional="true">
+      <description>MinConstTemp</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="TEMP"/>
@@ -149,7 +156,8 @@ limitations under the License.
         </optionalConform>
       </otherwiseConform>
     </attribute>
-    <attribute side="server" code="0x000C" name="MaxConstTemp" define="MAX_CONST_TEMP" type="int16s" isNullable="true" min="0x954D" optional="true">
+    <attribute side="server" code="0x000C" name="MaxConstTemp" define="MAX_CONST_TEMP" type="int16s" isNullable="true" min="-27315" optional="true">
+      <description>MaxConstTemp</description>
       <otherwiseConform>
         <mandatoryConform>
           <feature name="TEMP"/>
@@ -159,113 +167,125 @@ limitations under the License.
         </optionalConform>
       </otherwiseConform>
     </attribute>
-    <attribute side="server" code="0x0010" name="PumpStatus" define="PUMP_STATUS" type="PumpStatusBitmap" default="0x0000" reportable="true" optional="true">
+    <attribute side="server" code="0x0010" name="PumpStatus" define="PUMP_STATUS" type="PumpStatusBitmap" default="0x0000" optional="true" min="0x0000" max="0x01FF">
+      <description>PumpStatus</description>
       <optionalConform/>
     </attribute>
-    <attribute side="server" code="0x0011" name="EffectiveOperationMode" define="EFFECTIVE_OPERATION_MODE" type="OperationModeEnum" min="0x00" max="0x03">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0012" name="EffectiveControlMode" define="EFFECTIVE_CONTROL_MODE" type="ControlModeEnum" min="0x00" max="0x07">
-      <mandatoryConform/>
-    </attribute>
-    <attribute side="server" code="0x0013" name="Capacity" define="CAPACITY" type="int16s" isNullable="true" reportable="true">
-      <mandatoryConform/>
-    </attribute>
+    <attribute side="server" code="0x0011" name="EffectiveOperationMode" define="EFFECTIVE_OPERATION_MODE" type="OperationModeEnum" min="0x00" max="0x03">EffectiveOperationMode</attribute>
+    <attribute side="server" code="0x0012" name="EffectiveControlMode" define="EFFECTIVE_CONTROL_MODE" type="ControlModeEnum" min="0x00" max="0x07">EffectiveControlMode</attribute>
+    <attribute side="server" code="0x0013" name="Capacity" define="CAPACITY" type="int16s" isNullable="true">Capacity</attribute>
     <attribute side="server" code="0x0014" name="Speed" define="SPEED" type="int16u" isNullable="true" optional="true">
+      <description>Speed</description>
       <optionalConform/>
     </attribute>
     <attribute side="server" code="0x0015" name="LifetimeRunningHours" define="LIFETIME_RUNNING_HOURS" type="int24u" isNullable="true" writable="true" default="0x000000" optional="true">
-      <access op="read" privilege="view"/>
       <access op="write" privilege="manage"/>
+      <description>LifetimeRunningHours</description>
       <optionalConform/>
     </attribute>
     <attribute side="server" code="0x0016" name="Power" define="PUMP_POWER" type="int24u" isNullable="true" optional="true">
+      <description>Power</description>
       <optionalConform/>
     </attribute>
     <attribute side="server" code="0x0017" name="LifetimeEnergyConsumed" define="LIFETIME_ENERGY_CONSUMED" type="int32u" isNullable="true" writable="true" default="0x00000000" optional="true">
-      <access op="read" privilege="view"/>
       <access op="write" privilege="manage"/>
+      <description>LifetimeEnergyConsumed</description>
       <optionalConform/>
     </attribute>
-    <attribute side="server" code="0x0020" name="OperationMode" define="OPERATION_MODE" type="OperationModeEnum" min="0x00" max="0x03" writable="true" default="0x00" optional="false">
-      <access op="read" privilege="view"/>
+    <attribute side="server" code="0x0020" name="OperationMode" define="OPERATION_MODE" type="OperationModeEnum" min="0x00" max="0x03" writable="true" default="0x00">
       <access op="write" privilege="manage"/>
-      <mandatoryConform/>
+      <description>OperationMode</description>
     </attribute>
     <attribute side="server" code="0x0021" name="ControlMode" define="CONTROL_MODE" type="ControlModeEnum" min="0x00" max="0x07" writable="true" default="0x00" optional="true">
-      <access op="read" privilege="view"/>
       <access op="write" privilege="manage"/>
+      <description>ControlMode</description>
       <optionalConform/>
     </attribute>
-
     <event side="server" code="0x00" priority="info" name="SupplyVoltageLow" optional="true">
       <description>SupplyVoltageLow</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x01" priority="info" name="SupplyVoltageHigh" optional="true">
       <description>SupplyVoltageHigh</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x02" priority="info" name="PowerMissingPhase" optional="true">
       <description>PowerMissingPhase</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x03" priority="info" name="SystemPressureLow" optional="true">
       <description>SystemPressureLow</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x04" priority="info" name="SystemPressureHigh" optional="true">
       <description>SystemPressureHigh</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x05" priority="critical" name="DryRunning" optional="true">
       <description>DryRunning</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x06" priority="info" name="MotorTemperatureHigh" optional="true">
       <description>MotorTemperatureHigh</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x07" priority="critical" name="PumpMotorFatalFailure" optional="true">
       <description>PumpMotorFatalFailure</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x08" priority="info" name="ElectronicTemperatureHigh" optional="true">
       <description>ElectronicTemperatureHigh</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x09" priority="critical" name="PumpBlocked" optional="true">
       <description>PumpBlocked</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x0A" priority="info" name="SensorFailure" optional="true">
       <description>SensorFailure</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x0B" priority="info" name="ElectronicNonFatalFailure" optional="true">
       <description>ElectronicNonFatalFailure</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x0C" priority="critical" name="ElectronicFatalFailure" optional="true">
       <description>ElectronicFatalFailure</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x0D" priority="info" name="GeneralFault" optional="true">
       <description>GeneralFault</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x0E" priority="info" name="Leakage" optional="true">
       <description>Leakage</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x0F" priority="info" name="AirDetection" optional="true">
       <description>AirDetection</description>
       <optionalConform/>
     </event>
+
     <event side="server" code="0x10" priority="info" name="TurbineOperation" optional="true">
       <description>TurbineOperation</description>
       <optionalConform/>
     </event>
+
   </cluster>
 
   <bitmap name="PumpStatusBitmap" type="bitmap16">
@@ -298,6 +318,4 @@ limitations under the License.
     <item name="ConstantTemperature" value="0x5"/>
     <item name="Automatic" value="0x7"/>
   </enum>
-
-
 </configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index d2ef221de95353..ba48ccc0dccb6c 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -6740,7 +6740,7 @@ provisional cluster ServiceArea = 336 {
 
 /** An interface for configuring and controlling pumps. */
 cluster PumpConfigurationAndControl = 512 {
-  revision 3;
+  revision 4;
 
   enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;