diff --git a/CODEOWNERS b/CODEOWNERS
index cc4138b362d..29d4adc8933 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -214,7 +214,7 @@ homeassistant/components/spider/* @peternijssen
 homeassistant/components/sql/* @dgomes
 homeassistant/components/statistics/* @fabaff
 homeassistant/components/stiebel_eltron/* @fucm
-homeassistant/components/sun/* @home-assistant/core
+homeassistant/components/sun/* @Swamp-Ig
 homeassistant/components/supla/* @mwegrzynek
 homeassistant/components/swiss_hydrological_data/* @fabaff
 homeassistant/components/swiss_public_transport/* @fabaff
diff --git a/homeassistant/components/sun/manifest.json b/homeassistant/components/sun/manifest.json
index 2ef89da8f69..e55131306dc 100644
--- a/homeassistant/components/sun/manifest.json
+++ b/homeassistant/components/sun/manifest.json
@@ -5,6 +5,6 @@
   "requirements": [],
   "dependencies": [],
   "codeowners": [
-    "@home-assistant/core"
+    "@Swamp-Ig"
   ]
 }