diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 45b1f0ff351..c2f5e89dc51 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -15,6 +15,6 @@
     "websocket_api"
   ],
   "codeowners": [
-    "@home-assistant/core"
+    "@home-assistant/frontend"
   ]
 }
diff --git a/homeassistant/components/lovelace/manifest.json b/homeassistant/components/lovelace/manifest.json
index 1c1a7a107e4..dd8da40efe4 100644
--- a/homeassistant/components/lovelace/manifest.json
+++ b/homeassistant/components/lovelace/manifest.json
@@ -5,6 +5,6 @@
   "requirements": [],
   "dependencies": [],
   "codeowners": [
-    "@home-assistant/core"
+    "@home-assistant/frontend"
   ]
 }
diff --git a/homeassistant/components/panel_custom/manifest.json b/homeassistant/components/panel_custom/manifest.json
index 5fb7adb2a4a..06c9338742c 100644
--- a/homeassistant/components/panel_custom/manifest.json
+++ b/homeassistant/components/panel_custom/manifest.json
@@ -7,6 +7,6 @@
     "frontend"
   ],
   "codeowners": [
-    "@home-assistant/core"
+    "@home-assistant/frontend"
   ]
 }
diff --git a/homeassistant/components/panel_iframe/manifest.json b/homeassistant/components/panel_iframe/manifest.json
index 127ff3caa4d..e66f94bdcc2 100644
--- a/homeassistant/components/panel_iframe/manifest.json
+++ b/homeassistant/components/panel_iframe/manifest.json
@@ -7,6 +7,6 @@
     "frontend"
   ],
   "codeowners": [
-    "@home-assistant/core"
+    "@home-assistant/frontend"
   ]
 }