diff --git a/CODEOWNERS b/CODEOWNERS
index 3c975ca386242..ad9345c3ab6d1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -39,3 +39,7 @@ homeassistant/components/*/zwave.py @home-assistant/z-wave
 homeassistant/components/cover/template.py @PhracturedBlue
 homeassistant/components/device_tracker/automatic.py @armills
 homeassistant/components/media_player/kodi.py @armills
+homeassistant/components/light/tplink.py @rytilahti
+homeassistant/components/switch/tplink.py @rytilahti
+homeassistant/components/climate/eq3btsmart.py @rytilahti
+homeassistant/components/*/xiaomi_miio.py @rytilahti