diff --git a/CODEOWNERS b/CODEOWNERS
index ae5bcb452cb..5adc4d071c2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -83,7 +83,7 @@ homeassistant/components/gpsd/* @fabaff
 homeassistant/components/group/* @home-assistant/core
 homeassistant/components/gtfs/* @robbiet480
 homeassistant/components/harmony/* @ehendrix23
-homeassistant/components/hassio/* @home-assistant/hassio
+homeassistant/components/hassio/* @home-assistant/hass-io
 homeassistant/components/heos/* @andrewsayre
 homeassistant/components/hikvision/* @mezz64
 homeassistant/components/history/* @home-assistant/core
diff --git a/homeassistant/components/hassio/manifest.json b/homeassistant/components/hassio/manifest.json
index e412f587abd..be345fb5adb 100644
--- a/homeassistant/components/hassio/manifest.json
+++ b/homeassistant/components/hassio/manifest.json
@@ -7,6 +7,6 @@
     "http"
   ],
   "codeowners": [
-    "@home-assistant/hassio"
+    "@home-assistant/hass-io"
   ]
 }