diff --git a/CODEOWNERS b/CODEOWNERS
index 59bd8c31af1..307d9ebc068 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -275,6 +275,7 @@ homeassistant/components/yeelight/* @rytilahti @zewelor
 homeassistant/components/yeelightsunflower/* @lindsaymarkward
 homeassistant/components/yessssms/* @flowolf
 homeassistant/components/yi/* @bachya
+homeassistant/components/yr/* @danielhiversen
 homeassistant/components/zeroconf/* @robbiet480 @Kane610
 homeassistant/components/zha/* @dmulcahey @adminiuga
 homeassistant/components/zone/* @home-assistant/core
diff --git a/homeassistant/components/yr/manifest.json b/homeassistant/components/yr/manifest.json
index 88daadd35aa..7f06ddddcb5 100644
--- a/homeassistant/components/yr/manifest.json
+++ b/homeassistant/components/yr/manifest.json
@@ -6,5 +6,7 @@
     "xmltodict==0.12.0"
   ],
   "dependencies": [],
-  "codeowners": []
+  "codeowners": [
+    "@danielhiversen"
+  ]
 }