diff --git a/CODEOWNERS b/CODEOWNERS
index 25b44d84267..20ecc0272cf 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -33,6 +33,8 @@ homeassistant/components/advantage_air/* @Bre77
 tests/components/advantage_air/* @Bre77
 homeassistant/components/agent_dvr/* @ispysoftware
 tests/components/agent_dvr/* @ispysoftware
+homeassistant/components/air_quality/* @home-assistant/core
+tests/components/air_quality/* @home-assistant/core
 homeassistant/components/airly/* @bieniu
 tests/components/airly/* @bieniu
 homeassistant/components/airnow/* @asymworks
@@ -43,6 +45,10 @@ homeassistant/components/airtouch4/* @LonePurpleWolf
 tests/components/airtouch4/* @LonePurpleWolf
 homeassistant/components/airvisual/* @bachya
 tests/components/airvisual/* @bachya
+homeassistant/components/alarm_control_panel/* @home-assistant/core
+tests/components/alarm_control_panel/* @home-assistant/core
+homeassistant/components/alert/* @home-assistant/core
+tests/components/alert/* @home-assistant/core
 homeassistant/components/alexa/* @home-assistant/cloud @ochlocracy
 tests/components/alexa/* @home-assistant/cloud @ochlocracy
 homeassistant/components/almond/* @gcampax @balloob
@@ -108,6 +114,8 @@ homeassistant/components/azure_service_bus/* @hfurubotten
 homeassistant/components/balboa/* @garbled1
 tests/components/balboa/* @garbled1
 homeassistant/components/beewi_smartclim/* @alemuro
+homeassistant/components/binary_sensor/* @home-assistant/core
+tests/components/binary_sensor/* @home-assistant/core
 homeassistant/components/bitcoin/* @fabaff
 homeassistant/components/bizkaibus/* @UgaitzEtxebarria
 homeassistant/components/blebox/* @bbx-a @bbx-jp
@@ -138,6 +146,10 @@ homeassistant/components/buienradar/* @mjj4791 @ties @Robbie1221
 tests/components/buienradar/* @mjj4791 @ties @Robbie1221
 homeassistant/components/button/* @home-assistant/core
 tests/components/button/* @home-assistant/core
+homeassistant/components/calendar/* @home-assistant/core
+tests/components/calendar/* @home-assistant/core
+homeassistant/components/camera/* @home-assistant/core
+tests/components/camera/* @home-assistant/core
 homeassistant/components/cast/* @emontnemery
 tests/components/cast/* @emontnemery
 homeassistant/components/cert_expiry/* @Cereal2nd @jjlawren
@@ -148,6 +160,8 @@ homeassistant/components/cisco_mobility_express/* @fbradyirl
 homeassistant/components/cisco_webex_teams/* @fbradyirl
 homeassistant/components/climacell/* @raman325
 tests/components/climacell/* @raman325
+homeassistant/components/climate/* @home-assistant/core
+tests/components/climate/* @home-assistant/core
 homeassistant/components/cloud/* @home-assistant/cloud
 tests/components/cloud/* @home-assistant/cloud
 homeassistant/components/cloudflare/* @ludeeus @ctalkington
@@ -189,6 +203,8 @@ homeassistant/components/debugpy/* @frenck
 tests/components/debugpy/* @frenck
 homeassistant/components/deconz/* @Kane610
 tests/components/deconz/* @Kane610
+homeassistant/components/default_config/* @home-assistant/core
+tests/components/default_config/* @home-assistant/core
 homeassistant/components/delijn/* @bollewolle @Emilv2
 homeassistant/components/demo/* @home-assistant/core
 tests/components/demo/* @home-assistant/core
@@ -198,6 +214,8 @@ homeassistant/components/derivative/* @afaucogney
 tests/components/derivative/* @afaucogney
 homeassistant/components/device_automation/* @home-assistant/core
 tests/components/device_automation/* @home-assistant/core
+homeassistant/components/device_tracker/* @home-assistant/core
+tests/components/device_tracker/* @home-assistant/core
 homeassistant/components/devolo_home_control/* @2Fake @Shutgun
 tests/components/devolo_home_control/* @2Fake @Shutgun
 homeassistant/components/devolo_home_network/* @2Fake @Shutgun
@@ -210,6 +228,8 @@ homeassistant/components/diagnostics/* @home-assistant/core
 tests/components/diagnostics/* @home-assistant/core
 homeassistant/components/digital_ocean/* @fabaff
 homeassistant/components/discogs/* @thibmaek
+homeassistant/components/discovery/* @home-assistant/core
+tests/components/discovery/* @home-assistant/core
 homeassistant/components/dlna_dmr/* @StevenLooman @chishm
 tests/components/dlna_dmr/* @StevenLooman @chishm
 homeassistant/components/dlna_dms/* @chishm
@@ -277,6 +297,8 @@ homeassistant/components/ezviz/* @RenierM26 @baqs
 tests/components/ezviz/* @RenierM26 @baqs
 homeassistant/components/faa_delays/* @ntilley905
 tests/components/faa_delays/* @ntilley905
+homeassistant/components/fan/* @home-assistant/core
+tests/components/fan/* @home-assistant/core
 homeassistant/components/fastdotcom/* @rohankapoorcom
 homeassistant/components/file/* @fabaff
 tests/components/file/* @fabaff
@@ -332,6 +354,8 @@ tests/components/generic_hygrostat/* @Shulyaka
 homeassistant/components/geniushub/* @zxdavb
 homeassistant/components/geo_json_events/* @exxamalte
 tests/components/geo_json_events/* @exxamalte
+homeassistant/components/geo_location/* @home-assistant/core
+tests/components/geo_location/* @home-assistant/core
 homeassistant/components/geo_rss_events/* @exxamalte
 tests/components/geo_rss_events/* @exxamalte
 homeassistant/components/geonetnz_quakes/* @exxamalte
@@ -434,6 +458,8 @@ homeassistant/components/ign_sismologia/* @exxamalte
 tests/components/ign_sismologia/* @exxamalte
 homeassistant/components/image/* @home-assistant/core
 tests/components/image/* @home-assistant/core
+homeassistant/components/image_processing/* @home-assistant/core
+tests/components/image_processing/* @home-assistant/core
 homeassistant/components/incomfort/* @zxdavb
 homeassistant/components/influxdb/* @fabaff @mdegat01
 tests/components/influxdb/* @fabaff @mdegat01
@@ -511,6 +537,8 @@ homeassistant/components/lcn/* @alengwenus
 tests/components/lcn/* @alengwenus
 homeassistant/components/lg_netcast/* @Drafteed
 homeassistant/components/life360/* @pnbruckner
+homeassistant/components/light/* @home-assistant/core
+tests/components/light/* @home-assistant/core
 homeassistant/components/linux_battery/* @fabaff
 homeassistant/components/litejet/* @joncar
 tests/components/litejet/* @joncar
@@ -518,6 +546,10 @@ homeassistant/components/litterrobot/* @natekspencer
 tests/components/litterrobot/* @natekspencer
 homeassistant/components/local_ip/* @issacg
 tests/components/local_ip/* @issacg
+homeassistant/components/lock/* @home-assistant/core
+tests/components/lock/* @home-assistant/core
+homeassistant/components/logbook/* @home-assistant/core
+tests/components/logbook/* @home-assistant/core
 homeassistant/components/logger/* @home-assistant/core
 tests/components/logger/* @home-assistant/core
 homeassistant/components/logi_circle/* @evanjd
@@ -539,6 +571,8 @@ homeassistant/components/mastodon/* @fabaff
 homeassistant/components/matrix/* @tinloaf
 homeassistant/components/mazda/* @bdr99
 tests/components/mazda/* @bdr99
+homeassistant/components/media_player/* @home-assistant/core
+tests/components/media_player/* @home-assistant/core
 homeassistant/components/media_source/* @hunterjm
 tests/components/media_source/* @hunterjm
 homeassistant/components/mediaroom/* @dgomes
@@ -617,6 +651,8 @@ tests/components/netatmo/* @cgtobi
 homeassistant/components/netdata/* @fabaff
 homeassistant/components/netgear/* @hacf-fr @Quentame @starkillerOG
 tests/components/netgear/* @hacf-fr @Quentame @starkillerOG
+homeassistant/components/network/* @home-assistant/core
+tests/components/network/* @home-assistant/core
 homeassistant/components/nexia/* @bdraco
 tests/components/nexia/* @bdraco
 homeassistant/components/nextbus/* @vividboarder
@@ -772,6 +808,8 @@ tests/components/recollect_waste/* @bachya
 homeassistant/components/recorder/* @home-assistant/core
 tests/components/recorder/* @home-assistant/core
 homeassistant/components/rejseplanen/* @DarkFox
+homeassistant/components/remote/* @home-assistant/core
+tests/components/remote/* @home-assistant/core
 homeassistant/components/renault/* @epenet
 tests/components/renault/* @epenet
 homeassistant/components/repetier/* @MTrab @ShadowBr0ther
@@ -797,6 +835,8 @@ homeassistant/components/roon/* @pavoni
 tests/components/roon/* @pavoni
 homeassistant/components/rpi_power/* @shenxn @swetoast
 tests/components/rpi_power/* @shenxn @swetoast
+homeassistant/components/rss_feed_template/* @home-assistant/core
+tests/components/rss_feed_template/* @home-assistant/core
 homeassistant/components/rtsp_to_webrtc/* @allenporter
 tests/components/rtsp_to_webrtc/* @allenporter
 homeassistant/components/ruckus_unleashed/* @gabe565
@@ -825,6 +865,8 @@ homeassistant/components/senseme/* @mikelawrence @bdraco
 tests/components/senseme/* @mikelawrence @bdraco
 homeassistant/components/sensibo/* @andrey-git @gjohansson-ST
 tests/components/sensibo/* @andrey-git @gjohansson-ST
+homeassistant/components/sensor/* @home-assistant/core
+tests/components/sensor/* @home-assistant/core
 homeassistant/components/sentry/* @dcramer @frenck
 tests/components/sentry/* @dcramer @frenck
 homeassistant/components/serial/* @fabaff
@@ -928,6 +970,8 @@ homeassistant/components/surepetcare/* @benleb @danielhiversen
 tests/components/surepetcare/* @benleb @danielhiversen
 homeassistant/components/swiss_hydrological_data/* @fabaff
 homeassistant/components/swiss_public_transport/* @fabaff
+homeassistant/components/switch/* @home-assistant/core
+tests/components/switch/* @home-assistant/core
 homeassistant/components/switchbot/* @danielhiversen @RenierM26
 tests/components/switchbot/* @danielhiversen @RenierM26
 homeassistant/components/switcher_kis/* @tomerfi @thecode
@@ -1019,6 +1063,8 @@ homeassistant/components/usgs_earthquakes_feed/* @exxamalte
 tests/components/usgs_earthquakes_feed/* @exxamalte
 homeassistant/components/utility_meter/* @dgomes
 tests/components/utility_meter/* @dgomes
+homeassistant/components/vacuum/* @home-assistant/core
+tests/components/vacuum/* @home-assistant/core
 homeassistant/components/vallox/* @andre-richter @slovdahl @viiru-
 tests/components/vallox/* @andre-richter @slovdahl @viiru-
 homeassistant/components/velbus/* @Cereal2nd @brefra
@@ -1053,6 +1099,8 @@ tests/components/wake_on_lan/* @ntilley905
 homeassistant/components/wallbox/* @hesselonline
 tests/components/wallbox/* @hesselonline
 homeassistant/components/waqi/* @andrey-git
+homeassistant/components/water_heater/* @home-assistant/core
+tests/components/water_heater/* @home-assistant/core
 homeassistant/components/watson_tts/* @rutkai
 homeassistant/components/watttime/* @bachya
 tests/components/watttime/* @bachya
@@ -1060,6 +1108,8 @@ homeassistant/components/waze_travel_time/* @eifinger
 tests/components/waze_travel_time/* @eifinger
 homeassistant/components/weather/* @fabaff
 tests/components/weather/* @fabaff
+homeassistant/components/webhook/* @home-assistant/core
+tests/components/webhook/* @home-assistant/core
 homeassistant/components/webostv/* @bendavid @thecode
 tests/components/webostv/* @bendavid @thecode
 homeassistant/components/websocket_api/* @home-assistant/core
diff --git a/homeassistant/components/air_quality/manifest.json b/homeassistant/components/air_quality/manifest.json
index 55fbdbdafd1..978089d1816 100644
--- a/homeassistant/components/air_quality/manifest.json
+++ b/homeassistant/components/air_quality/manifest.json
@@ -2,6 +2,6 @@
   "domain": "air_quality",
   "name": "Air Quality",
   "documentation": "https://www.home-assistant.io/integrations/air_quality",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/alarm_control_panel/manifest.json b/homeassistant/components/alarm_control_panel/manifest.json
index e4cd0e27a39..461094e8ce6 100644
--- a/homeassistant/components/alarm_control_panel/manifest.json
+++ b/homeassistant/components/alarm_control_panel/manifest.json
@@ -2,6 +2,6 @@
   "domain": "alarm_control_panel",
   "name": "Alarm Control Panel",
   "documentation": "https://www.home-assistant.io/integrations/alarm_control_panel",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/alert/manifest.json b/homeassistant/components/alert/manifest.json
index f5d3e08f2fe..bf9724ec2b9 100644
--- a/homeassistant/components/alert/manifest.json
+++ b/homeassistant/components/alert/manifest.json
@@ -3,7 +3,7 @@
   "name": "Alert",
   "documentation": "https://www.home-assistant.io/integrations/alert",
   "after_dependencies": ["notify"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal",
   "iot_class": "local_push"
 }
diff --git a/homeassistant/components/binary_sensor/manifest.json b/homeassistant/components/binary_sensor/manifest.json
index be2feb9d207..d1c631ee94b 100644
--- a/homeassistant/components/binary_sensor/manifest.json
+++ b/homeassistant/components/binary_sensor/manifest.json
@@ -2,6 +2,6 @@
   "domain": "binary_sensor",
   "name": "Binary Sensor",
   "documentation": "https://www.home-assistant.io/integrations/binary_sensor",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/calendar/manifest.json b/homeassistant/components/calendar/manifest.json
index 2455744ee4e..2fb4df84414 100644
--- a/homeassistant/components/calendar/manifest.json
+++ b/homeassistant/components/calendar/manifest.json
@@ -3,6 +3,6 @@
   "name": "Calendar",
   "documentation": "https://www.home-assistant.io/integrations/calendar",
   "dependencies": ["http"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/camera/manifest.json b/homeassistant/components/camera/manifest.json
index aaa60b61a47..7fad2044b7c 100644
--- a/homeassistant/components/camera/manifest.json
+++ b/homeassistant/components/camera/manifest.json
@@ -5,6 +5,6 @@
   "dependencies": ["http"],
   "requirements": ["PyTurboJPEG==1.6.5"],
   "after_dependencies": ["media_player"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/climate/manifest.json b/homeassistant/components/climate/manifest.json
index 5d950ccbe2d..8b54d3a91ad 100644
--- a/homeassistant/components/climate/manifest.json
+++ b/homeassistant/components/climate/manifest.json
@@ -2,6 +2,6 @@
   "domain": "climate",
   "name": "Climate",
   "documentation": "https://www.home-assistant.io/integrations/climate",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/default_config/manifest.json b/homeassistant/components/default_config/manifest.json
index 9a65af96852..1ab827529c6 100644
--- a/homeassistant/components/default_config/manifest.json
+++ b/homeassistant/components/default_config/manifest.json
@@ -35,6 +35,6 @@
     "zeroconf",
     "zone"
   ],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/device_tracker/manifest.json b/homeassistant/components/device_tracker/manifest.json
index 6e29d977f66..7abd68b03e2 100644
--- a/homeassistant/components/device_tracker/manifest.json
+++ b/homeassistant/components/device_tracker/manifest.json
@@ -4,6 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/device_tracker",
   "dependencies": ["zone"],
   "after_dependencies": [],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/discovery/manifest.json b/homeassistant/components/discovery/manifest.json
index 3e7d31fcb1c..6f97993c788 100644
--- a/homeassistant/components/discovery/manifest.json
+++ b/homeassistant/components/discovery/manifest.json
@@ -4,7 +4,7 @@
   "documentation": "https://www.home-assistant.io/integrations/discovery",
   "requirements": ["netdisco==3.0.0"],
   "after_dependencies": ["zeroconf"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal",
   "loggers": ["netdisco"]
 }
diff --git a/homeassistant/components/fan/manifest.json b/homeassistant/components/fan/manifest.json
index 76573e08cbb..bb968240f0b 100644
--- a/homeassistant/components/fan/manifest.json
+++ b/homeassistant/components/fan/manifest.json
@@ -2,6 +2,6 @@
   "domain": "fan",
   "name": "Fan",
   "documentation": "https://www.home-assistant.io/integrations/fan",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/geo_location/manifest.json b/homeassistant/components/geo_location/manifest.json
index c222df8b2aa..2e0d7061099 100644
--- a/homeassistant/components/geo_location/manifest.json
+++ b/homeassistant/components/geo_location/manifest.json
@@ -2,6 +2,6 @@
   "domain": "geo_location",
   "name": "Geolocation",
   "documentation": "https://www.home-assistant.io/integrations/geo_location",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/image_processing/manifest.json b/homeassistant/components/image_processing/manifest.json
index 0541f4898c9..0315a69b82a 100644
--- a/homeassistant/components/image_processing/manifest.json
+++ b/homeassistant/components/image_processing/manifest.json
@@ -3,6 +3,6 @@
   "name": "Image Processing",
   "documentation": "https://www.home-assistant.io/integrations/image_processing",
   "dependencies": ["camera"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/light/manifest.json b/homeassistant/components/light/manifest.json
index 27c504f6b91..c7cf2abc7c8 100644
--- a/homeassistant/components/light/manifest.json
+++ b/homeassistant/components/light/manifest.json
@@ -2,6 +2,6 @@
   "domain": "light",
   "name": "Light",
   "documentation": "https://www.home-assistant.io/integrations/light",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/lock/manifest.json b/homeassistant/components/lock/manifest.json
index b44a66613b0..f93d2962ea3 100644
--- a/homeassistant/components/lock/manifest.json
+++ b/homeassistant/components/lock/manifest.json
@@ -2,6 +2,6 @@
   "domain": "lock",
   "name": "Lock",
   "documentation": "https://www.home-assistant.io/integrations/lock",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/logbook/manifest.json b/homeassistant/components/logbook/manifest.json
index 58bc71959b3..66c0348a2ac 100644
--- a/homeassistant/components/logbook/manifest.json
+++ b/homeassistant/components/logbook/manifest.json
@@ -3,6 +3,6 @@
   "name": "Logbook",
   "documentation": "https://www.home-assistant.io/integrations/logbook",
   "dependencies": ["frontend", "http", "recorder"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/media_player/manifest.json b/homeassistant/components/media_player/manifest.json
index 7a8e47adf20..118d05036cc 100644
--- a/homeassistant/components/media_player/manifest.json
+++ b/homeassistant/components/media_player/manifest.json
@@ -3,6 +3,6 @@
   "name": "Media Player",
   "documentation": "https://www.home-assistant.io/integrations/media_player",
   "dependencies": ["http"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/network/manifest.json b/homeassistant/components/network/manifest.json
index 84e86014036..9f2fa7849f0 100644
--- a/homeassistant/components/network/manifest.json
+++ b/homeassistant/components/network/manifest.json
@@ -3,7 +3,7 @@
   "name": "Network Configuration",
   "documentation": "https://www.home-assistant.io/integrations/network",
   "requirements": ["ifaddr==0.1.7"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "dependencies": ["websocket_api"],
   "quality_scale": "internal",
   "iot_class": "local_push"
diff --git a/homeassistant/components/remote/manifest.json b/homeassistant/components/remote/manifest.json
index e2caf2d5606..d08cb624c16 100644
--- a/homeassistant/components/remote/manifest.json
+++ b/homeassistant/components/remote/manifest.json
@@ -2,6 +2,6 @@
   "domain": "remote",
   "name": "Remote",
   "documentation": "https://www.home-assistant.io/integrations/remote",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/rss_feed_template/manifest.json b/homeassistant/components/rss_feed_template/manifest.json
index 46b449b03dd..ad0ab14cadd 100644
--- a/homeassistant/components/rss_feed_template/manifest.json
+++ b/homeassistant/components/rss_feed_template/manifest.json
@@ -3,7 +3,7 @@
   "name": "RSS Feed Template",
   "documentation": "https://www.home-assistant.io/integrations/rss_feed_template",
   "dependencies": ["http"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal",
   "iot_class": "local_push"
 }
diff --git a/homeassistant/components/sensor/manifest.json b/homeassistant/components/sensor/manifest.json
index 163bc895975..4726ac790a7 100644
--- a/homeassistant/components/sensor/manifest.json
+++ b/homeassistant/components/sensor/manifest.json
@@ -2,7 +2,7 @@
   "domain": "sensor",
   "name": "Sensor",
   "documentation": "https://www.home-assistant.io/integrations/sensor",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal",
   "after_dependencies": ["recorder"]
 }
diff --git a/homeassistant/components/switch/manifest.json b/homeassistant/components/switch/manifest.json
index 6f0113d1b9c..4c52e596648 100644
--- a/homeassistant/components/switch/manifest.json
+++ b/homeassistant/components/switch/manifest.json
@@ -2,6 +2,6 @@
   "domain": "switch",
   "name": "Switch",
   "documentation": "https://www.home-assistant.io/integrations/switch",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/vacuum/manifest.json b/homeassistant/components/vacuum/manifest.json
index 2a874b36a1c..ee4fa6a471e 100644
--- a/homeassistant/components/vacuum/manifest.json
+++ b/homeassistant/components/vacuum/manifest.json
@@ -2,6 +2,6 @@
   "domain": "vacuum",
   "name": "Vacuum",
   "documentation": "https://www.home-assistant.io/integrations/vacuum",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/water_heater/manifest.json b/homeassistant/components/water_heater/manifest.json
index ab12a8ab820..ac00bc64210 100644
--- a/homeassistant/components/water_heater/manifest.json
+++ b/homeassistant/components/water_heater/manifest.json
@@ -2,6 +2,6 @@
   "domain": "water_heater",
   "name": "Water Heater",
   "documentation": "https://www.home-assistant.io/integrations/water_heater",
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/webhook/manifest.json b/homeassistant/components/webhook/manifest.json
index 509563bb4b0..4ca247ed720 100644
--- a/homeassistant/components/webhook/manifest.json
+++ b/homeassistant/components/webhook/manifest.json
@@ -3,6 +3,6 @@
   "name": "Webhook",
   "documentation": "https://www.home-assistant.io/integrations/webhook",
   "dependencies": ["http"],
-  "codeowners": [],
+  "codeowners": ["@home-assistant/core"],
   "quality_scale": "internal"
 }