diff --git a/CODEOWNERS b/CODEOWNERS
index ad99ecf6e9c..6032294e4d6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -666,8 +666,8 @@ build.json @home-assistant/supervisor
 /tests/components/lyric/ @timmo001
 /homeassistant/components/mastodon/ @fabaff
 /homeassistant/components/matrix/ @tinloaf
-/homeassistant/components/matter/ @MartinHjelmare @marcelveldt
-/tests/components/matter/ @MartinHjelmare @marcelveldt
+/homeassistant/components/matter/ @home-assistant/matter
+/tests/components/matter/ @home-assistant/matter
 /homeassistant/components/mazda/ @bdr99
 /tests/components/mazda/ @bdr99
 /homeassistant/components/meater/ @Sotolotl @emontnemery
diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json
index aa64ac4755e..cf0cee595a6 100644
--- a/homeassistant/components/matter/manifest.json
+++ b/homeassistant/components/matter/manifest.json
@@ -5,6 +5,6 @@
   "documentation": "https://www.home-assistant.io/integrations/matter",
   "requirements": ["python-matter-server==1.0.6"],
   "dependencies": ["websocket_api"],
-  "codeowners": ["@MartinHjelmare", "@marcelveldt"],
+  "codeowners": ["@home-assistant/matter"],
   "iot_class": "local_push"
 }