diff --git a/CODEOWNERS b/CODEOWNERS
index ed87cfc635c..b8d7ea952ee 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1484,8 +1484,8 @@ build.json @home-assistant/supervisor
 /tests/components/subaru/ @G-Two
 /homeassistant/components/suez_water/ @ooii @jb101010-2
 /tests/components/suez_water/ @ooii @jb101010-2
-/homeassistant/components/sun/ @Swamp-Ig
-/tests/components/sun/ @Swamp-Ig
+/homeassistant/components/sun/ @home-assistant/core
+/tests/components/sun/ @home-assistant/core
 /homeassistant/components/supla/ @mwegrzynek
 /homeassistant/components/surepetcare/ @benleb @danielhiversen
 /tests/components/surepetcare/ @benleb @danielhiversen
diff --git a/homeassistant/components/sun/manifest.json b/homeassistant/components/sun/manifest.json
index f6b4ae1976b..b693509b27a 100644
--- a/homeassistant/components/sun/manifest.json
+++ b/homeassistant/components/sun/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "sun",
   "name": "Sun",
-  "codeowners": ["@Swamp-Ig"],
+  "codeowners": ["@home-assistant/core"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sun",
   "iot_class": "calculated",