diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h b/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/bridge-app/bridge-common/gen/attribute-id.h b/examples/bridge-app/bridge-common/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/bridge-app/bridge-common/gen/attribute-id.h
+++ b/examples/bridge-app/bridge-common/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/chip-tool/gen/attribute-id.h b/examples/chip-tool/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/chip-tool/gen/attribute-id.h
+++ b/examples/chip-tool/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/lighting-app/lighting-common/gen/attribute-id.h b/examples/lighting-app/lighting-common/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/lighting-app/lighting-common/gen/attribute-id.h
+++ b/examples/lighting-app/lighting-common/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/lock-app/lock-common/gen/attribute-id.h b/examples/lock-app/lock-common/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/lock-app/lock-common/gen/attribute-id.h
+++ b/examples/lock-app/lock-common/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h b/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/tv-app/tv-common/gen/attribute-id.h b/examples/tv-app/tv-common/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/tv-app/tv-common/gen/attribute-id.h
+++ b/examples/tv-app/tv-common/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/examples/window-app/common/gen/attribute-id.h b/examples/window-app/common/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/examples/window-app/common/gen/attribute-id.h
+++ b/examples/window-app/common/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml
index 6ed1b74310dae1..e97908986c584c 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/general.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml
@@ -163,9 +163,9 @@ limitations under the License.
       <arg name="extendedDiscoverAttributesInfoRecords" type="ExtendedDiscoverAttributesInfoRecord" array="true"/>
     </command>
     <attribute side="client" code="0xFFFD" define="CLUSTER_REVISION_CLIENT" type="INT16U" min="0x0001" max="0xFFFE" writable="false" default="0x0001" optional="false" introducedIn="zcl-6.0-15-02017-001">cluster revision</attribute>
-    <attribute side="client" code="0xFFFE" define="REPORTING_STATUS_CLIENT" type="ENUM8" min="0x00" max="0xFF" writable="false" optional="true" introducedIn="zcl-6.0-15-02017-001">reporting status</attribute>
+    <attribute side="client" code="0xFFFC" define="FEATURE_MAP_CLIENT" type="INT32U" writable="false" default="0x0000" optional="true">feature map</attribute>
     <attribute side="server" code="0xFFFD" define="CLUSTER_REVISION_SERVER" type="INT16U" min="0x0001" max="0xFFFE" writable="false" default="0x0001" optional="false" introducedIn="zcl-6.0-15-02017-001">cluster revision</attribute>
-    <attribute side="server" code="0xFFFE" define="REPORTING_STATUS_SERVER" type="ENUM8" min="0x00" max="0xFF" writable="false" optional="true" introducedIn="zcl-6.0-15-02017-001">reporting status</attribute>
+    <attribute side="server" code="0xFFFC" define="FEATURE_MAP_SERVER" type="INT32U" writable="false" default="0x0000" optional="true">feature map</attribute>
   </global>
   <cluster singleton="true">
     <name>Basic</name>
diff --git a/src/controller/python/gen/attribute-id.h b/src/controller/python/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/src/controller/python/gen/attribute-id.h
+++ b/src/controller/python/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration
 
diff --git a/src/darwin/Framework/CHIP/gen/attribute-id.h b/src/darwin/Framework/CHIP/gen/attribute-id.h
index 229d4014f4b1ba..6c224f5faf016e 100644
--- a/src/darwin/Framework/CHIP/gen/attribute-id.h
+++ b/src/darwin/Framework/CHIP/gen/attribute-id.h
@@ -21,10 +21,10 @@
 #pragma once
 
 // Global cluster attribute ids
+#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC)
+#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC)
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Power Configuration