diff --git a/test/gen-template/matter3/endpoint_config.zapt b/test/gen-template/matter3/endpoint_config.zapt
index c1ff67c571..3f7a0e3eb4 100644
--- a/test/gen-template/matter3/endpoint_config.zapt
+++ b/test/gen-template/matter3/endpoint_config.zapt
@@ -127,6 +127,6 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 // Test device types per endpoint
 {{#user_endpoints}}
   {{#user_device_types}}
-    Endpoint {{../endpointId}}, DeviceId: {{deviceIdentifier}}, DeviceVersion: {{deviceVersion}}, Composition:{{composition}}
+    Endpoint {{../endpointId}}, DeviceId: {{deviceIdentifier}}, DeviceVersion: {{deviceVersion}}, Composition: {{composition}}
   {{/user_device_types}}
 {{/user_endpoints}}
\ No newline at end of file
diff --git a/zcl-builtin/matter/data-model/chip/matter-devices.xml b/zcl-builtin/matter/data-model/chip/matter-devices.xml
index 47e9575dae..51c224fb38 100644
--- a/zcl-builtin/matter/data-model/chip/matter-devices.xml
+++ b/zcl-builtin/matter/data-model/chip/matter-devices.xml
@@ -2051,8 +2051,8 @@ limitations under the License.
         <class>Simple</class>
         <scope>Endpoint</scope>
         <endpointComposition>
-            <compositionType> tree </compositionType>
-            <endpoint mandatory ="true" constraint="1">
+            <compositionType>tree</compositionType>
+            <endpoint mandatory ="true" constraint="min 1">
                     <deviceType>0x0071</deviceType>
             </endpoint>
         </endpointComposition>