diff --git a/homeassistant/components/matter/button.py b/homeassistant/components/matter/button.py
index a8aa524580d..11a364622e3 100644
--- a/homeassistant/components/matter/button.py
+++ b/homeassistant/components/matter/button.py
@@ -58,7 +58,7 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.BUTTON,
         entity_description=MatterButtonEntityDescription(
             key="IdentifyButton",
-            entity_category=EntityCategory.CONFIG,
+            entity_category=EntityCategory.DIAGNOSTIC,
             device_class=ButtonDeviceClass.IDENTIFY,
             command=lambda: clusters.Identify.Commands.Identify(identifyTime=15),
         ),
diff --git a/tests/components/matter/snapshots/test_button.ambr b/tests/components/matter/snapshots/test_button.ambr
index 52232069d21..d6e24066cff 100644
--- a/tests/components/matter/snapshots/test_button.ambr
+++ b/tests/components/matter/snapshots/test_button.ambr
@@ -107,7 +107,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.aqara_door_and_window_sensor_p2_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -156,7 +156,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.aqara_motion_and_light_sensor_p2_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -205,7 +205,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.aqara_motion_and_light_sensor_p2_identify_2',
     'has_entity_name': True,
     'hidden_by': None,
@@ -254,7 +254,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.presence_multi_sensor_fp300_1_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -303,7 +303,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.presence_multi_sensor_fp300_1_identify_2',
     'has_entity_name': True,
     'hidden_by': None,
@@ -352,7 +352,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.presence_multi_sensor_fp300_1_identify_3',
     'has_entity_name': True,
     'hidden_by': None,
@@ -401,7 +401,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.presence_multi_sensor_fp300_1_identify_4',
     'has_entity_name': True,
     'hidden_by': None,
@@ -450,7 +450,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.climate_sensor_w100_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -499,7 +499,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.climate_sensor_w100_identify_2',
     'has_entity_name': True,
     'hidden_by': None,
@@ -548,7 +548,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.climate_sensor_w100_identify_3',
     'has_entity_name': True,
     'hidden_by': None,
@@ -597,7 +597,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.climate_sensor_w100_identify_4',
     'has_entity_name': True,
     'hidden_by': None,
@@ -646,7 +646,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.climate_sensor_w100_identify_5',
     'has_entity_name': True,
     'hidden_by': None,
@@ -695,7 +695,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.floor_heating_thermostat_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -744,7 +744,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.floor_heating_thermostat_identify_2',
     'has_entity_name': True,
     'hidden_by': None,
@@ -793,7 +793,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.aqara_smart_lock_u200_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -842,7 +842,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_color_temperature_light_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -891,7 +891,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.dimmable_plugin_unit_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -940,7 +940,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.connected_thermostat_ute_3000_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -989,7 +989,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.ecodeebot_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1038,7 +1038,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_door_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1087,7 +1087,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_energy_20ecn4101_identify_bottom',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1136,7 +1136,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_energy_20ecn4101_identify_top',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1185,7 +1185,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_energy_plug_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1234,7 +1234,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_energy_plug_patched_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1283,7 +1283,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_shutter_switch_20eci1701_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1332,7 +1332,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_thermo_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1381,7 +1381,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_weather_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1430,7 +1430,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.eve_weather_identify_2',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1479,7 +1479,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_extended_color_light_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1624,7 +1624,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mocked_fan_switch_identify_fan',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1673,7 +1673,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.hjmt_6b_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1722,7 +1722,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.smart_motion_sensor_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -1771,7 +1771,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.white_series_onoff_switch_identify_load_control',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2012,7 +2012,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.longan_link_hvac_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2253,7 +2253,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_lock_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2302,7 +2302,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.inovelli_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2351,7 +2351,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.inovelli_identify_2',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2400,7 +2400,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.inovelli_identify_6',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2449,7 +2449,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.inovelli_identify_config',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2498,7 +2498,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.inovelli_identify_down',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2547,7 +2547,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.inovelli_identify_up',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2596,7 +2596,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_occupancy_sensor_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2645,7 +2645,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_onoffpluginunit_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2694,7 +2694,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.d215s_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2743,7 +2743,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.dishwasher_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -2936,7 +2936,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.laundrywasher_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3177,7 +3177,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.light_switch_example_identify_1',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3226,7 +3226,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.refrigerator_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3323,7 +3323,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.smoke_sensor_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3420,7 +3420,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_switchunit_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3469,7 +3469,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.smart_radiator_thermostat_x_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3518,7 +3518,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.mock_temperature_sensor_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3567,7 +3567,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.longan_link_wncv_da01_identify',
     'has_entity_name': True,
     'hidden_by': None,
@@ -3616,7 +3616,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'button.yndx_00540_identify',
     'has_entity_name': True,
     'hidden_by': None,