diff --git a/CODEOWNERS b/CODEOWNERS
index 2966d69b032..a0b2e0c6d01 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -798,8 +798,8 @@ build.json @home-assistant/supervisor
 /tests/components/number/ @home-assistant/core @Shulyaka
 /homeassistant/components/nut/ @bdraco @ollo69
 /tests/components/nut/ @bdraco @ollo69
-/homeassistant/components/nws/ @MatthewFlamm
-/tests/components/nws/ @MatthewFlamm
+/homeassistant/components/nws/ @MatthewFlamm @kamiyo
+/tests/components/nws/ @MatthewFlamm @kamiyo
 /homeassistant/components/nzbget/ @chriscla
 /tests/components/nzbget/ @chriscla
 /homeassistant/components/obihai/ @dshokouhi
diff --git a/homeassistant/components/nws/manifest.json b/homeassistant/components/nws/manifest.json
index 67ad9255c68..93d04bcfba3 100644
--- a/homeassistant/components/nws/manifest.json
+++ b/homeassistant/components/nws/manifest.json
@@ -2,7 +2,7 @@
   "domain": "nws",
   "name": "National Weather Service (NWS)",
   "documentation": "https://www.home-assistant.io/integrations/nws",
-  "codeowners": ["@MatthewFlamm"],
+  "codeowners": ["@MatthewFlamm", "@kamiyo"],
   "requirements": ["pynws==1.4.1"],
   "quality_scale": "platinum",
   "config_flow": true,