diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index ce28156f3c34e9..ce12fb58abb9f5 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -2325,6 +2325,7 @@ limitations under the License.
             <include cluster="RVC Run Mode" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="RVC Clean Mode" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="RVC Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Service Area" client="false" server="false" clientLocked="true" serverLocked="false"></include>
         </clusters>
     </deviceType>
     <deviceType>
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt
index 7262fc9102917c..4eb2b2ea14784e 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
 class ServiceAreaClusterHomeLocationStruct(
   val locationName: String,
   val floorNumber: Int?,
-  val areaType: UInt?
+  val areaType: UInt?,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterHomeLocationStruct {\n")
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt
index 4ddb164dd98834..c6137199382840 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt
@@ -26,7 +26,7 @@ class ServiceAreaClusterLocationInfoStruct(
   val locationInfo: ServiceAreaClusterHomeLocationStruct?,
   val landmarkTag: UInt?,
   val positionTag: UInt?,
-  val surfaceTag: UInt?
+  val surfaceTag: UInt?,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterLocationInfoStruct {\n")
@@ -76,7 +76,7 @@ class ServiceAreaClusterLocationInfoStruct(
         if (!tlvReader.isNull()) {
           ServiceAreaClusterHomeLocationStruct.fromTlv(
             ContextSpecificTag(TAG_LOCATION_INFO),
-            tlvReader
+            tlvReader,
           )
         } else {
           tlvReader.getNull(ContextSpecificTag(TAG_LOCATION_INFO))
@@ -110,7 +110,7 @@ class ServiceAreaClusterLocationInfoStruct(
         locationInfo,
         landmarkTag,
         positionTag,
-        surfaceTag
+        surfaceTag,
       )
     }
   }
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationStruct.kt
index 1e34a8c330b656..f77ae437cad74c 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationStruct.kt
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
 class ServiceAreaClusterLocationStruct(
   val locationID: ULong,
   val mapID: UInt?,
-  val locationInfo: ServiceAreaClusterLocationInfoStruct
+  val locationInfo: ServiceAreaClusterLocationInfoStruct,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterLocationStruct {\n")
@@ -67,7 +67,7 @@ class ServiceAreaClusterLocationStruct(
       val locationInfo =
         ServiceAreaClusterLocationInfoStruct.fromTlv(
           ContextSpecificTag(TAG_LOCATION_INFO),
-          tlvReader
+          tlvReader,
         )
 
       tlvReader.exitContainer()
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt
index d65a0faa19c1a2..b601af531e103d 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt
@@ -27,7 +27,7 @@ class ServiceAreaClusterProgressStruct(
   val locationID: ULong,
   val status: UInt,
   val totalOperationalTime: Optional<ULong>?,
-  val estimatedTime: Optional<ULong>?
+  val estimatedTime: Optional<ULong>?,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterProgressStruct {\n")
@@ -102,7 +102,7 @@ class ServiceAreaClusterProgressStruct(
         locationID,
         status,
         totalOperationalTime,
-        estimatedTime
+        estimatedTime,
       )
     }
   }
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ServiceAreaCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ServiceAreaCluster.kt
index 11203b5f2a99b7..75e608837b40f0 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ServiceAreaCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ServiceAreaCluster.kt
@@ -149,7 +149,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun selectLocations(
     newLocations: List<UInt>?,
-    timedInvokeTimeout: Duration? = null
+    timedInvokeTimeout: Duration? = null,
   ): SelectLocationsResponse {
     val commandId: UInt = 0u
 
@@ -170,7 +170,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
       InvokeRequest(
         CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
         tlvPayload = tlvWriter.getEncoded(),
-        timedRequest = timedInvokeTimeout
+        timedRequest = timedInvokeTimeout,
       )
 
     val response: InvokeResponse = controller.invoke(request)
@@ -230,7 +230,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
       InvokeRequest(
         CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
         tlvPayload = tlvWriter.getEncoded(),
-        timedRequest = timedInvokeTimeout
+        timedRequest = timedInvokeTimeout,
       )
 
     val response: InvokeResponse = controller.invoke(request)
@@ -317,7 +317,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeSupportedLocationsAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<SupportedLocationsAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 0u
     val attributePaths =
@@ -330,7 +330,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -419,7 +419,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeSupportedMapsAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<SupportedMapsAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 1u
     val attributePaths =
@@ -432,7 +432,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -524,7 +524,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeSelectedLocationsAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<SelectedLocationsAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 2u
     val attributePaths =
@@ -537,7 +537,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -629,7 +629,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeCurrentLocationAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<CurrentLocationAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 3u
     val attributePaths =
@@ -642,7 +642,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -732,7 +732,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeEstimatedEndTimeAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<EstimatedEndTimeAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 4u
     val attributePaths =
@@ -745,7 +745,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -841,7 +841,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeProgressAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<ProgressAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 5u
     val attributePaths =
@@ -854,7 +854,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -945,7 +945,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeGeneratedCommandListAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<GeneratedCommandListAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 65528u
     val attributePaths =
@@ -958,7 +958,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1042,7 +1042,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeAcceptedCommandListAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<AcceptedCommandListAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 65529u
     val attributePaths =
@@ -1055,7 +1055,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1139,7 +1139,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeEventListAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<EventListAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 65530u
     val attributePaths =
@@ -1152,7 +1152,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1234,7 +1234,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeAttributeListAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<AttributeListAttributeSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 65531u
     val attributePaths =
@@ -1247,7 +1247,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1322,7 +1322,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeFeatureMapAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<UIntSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 65532u
     val attributePaths =
@@ -1335,7 +1335,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1403,7 +1403,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
 
   suspend fun subscribeClusterRevisionAttribute(
     minInterval: Int,
-    maxInterval: Int
+    maxInterval: Int,
   ): Flow<UShortSubscriptionState> {
     val ATTRIBUTE_ID: UInt = 65533u
     val attributePaths =
@@ -1416,7 +1416,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
         eventPaths = emptyList(),
         attributePaths = attributePaths,
         minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong())
+        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
       )
 
     return controller.subscribe(subscribeRequest).transform { subscriptionState ->
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt
index 5af3730a4460a8..76eb3671a26962 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
 class ServiceAreaClusterHomeLocationStruct(
   val locationName: String,
   val floorNumber: Short?,
-  val areaType: UByte?
+  val areaType: UByte?,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterHomeLocationStruct {\n")
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt
index c53b65c2dbb22f..5c8b08507bb76f 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt
@@ -26,7 +26,7 @@ class ServiceAreaClusterLocationInfoStruct(
   val locationInfo: ServiceAreaClusterHomeLocationStruct?,
   val landmarkTag: UByte?,
   val positionTag: UByte?,
-  val surfaceTag: UByte?
+  val surfaceTag: UByte?,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterLocationInfoStruct {\n")
@@ -76,7 +76,7 @@ class ServiceAreaClusterLocationInfoStruct(
         if (!tlvReader.isNull()) {
           ServiceAreaClusterHomeLocationStruct.fromTlv(
             ContextSpecificTag(TAG_LOCATION_INFO),
-            tlvReader
+            tlvReader,
           )
         } else {
           tlvReader.getNull(ContextSpecificTag(TAG_LOCATION_INFO))
@@ -110,7 +110,7 @@ class ServiceAreaClusterLocationInfoStruct(
         locationInfo,
         landmarkTag,
         positionTag,
-        surfaceTag
+        surfaceTag,
       )
     }
   }
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationStruct.kt
index 0a5b5aa3a825b4..42dc672d5c51fe 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationStruct.kt
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
 class ServiceAreaClusterLocationStruct(
   val locationID: UInt,
   val mapID: UByte?,
-  val locationInfo: ServiceAreaClusterLocationInfoStruct
+  val locationInfo: ServiceAreaClusterLocationInfoStruct,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterLocationStruct {\n")
@@ -67,7 +67,7 @@ class ServiceAreaClusterLocationStruct(
       val locationInfo =
         ServiceAreaClusterLocationInfoStruct.fromTlv(
           ContextSpecificTag(TAG_LOCATION_INFO),
-          tlvReader
+          tlvReader,
         )
 
       tlvReader.exitContainer()
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt
index a5dac6e470d299..3dd3eb1e412260 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt
@@ -27,7 +27,7 @@ class ServiceAreaClusterProgressStruct(
   val locationID: UInt,
   val status: UByte,
   val totalOperationalTime: Optional<UInt>?,
-  val estimatedTime: Optional<UInt>?
+  val estimatedTime: Optional<UInt>?,
 ) {
   override fun toString(): String = buildString {
     append("ServiceAreaClusterProgressStruct {\n")
@@ -102,7 +102,7 @@ class ServiceAreaClusterProgressStruct(
         locationID,
         status,
         totalOperationalTime,
-        estimatedTime
+        estimatedTime,
       )
     }
   }