diff --git a/CODEOWNERS b/CODEOWNERS
index 27614c3d49d..8e2dd1fa56d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -323,6 +323,7 @@ homeassistant/components/onewire/* @garbled1 @epenet
 homeassistant/components/onvif/* @hunterjm
 homeassistant/components/openerz/* @misialq
 homeassistant/components/opengarage/* @danielhiversen
+homeassistant/components/openhome/* @bazwilliams
 homeassistant/components/opentherm_gw/* @mvn23
 homeassistant/components/openuv/* @bachya
 homeassistant/components/openweathermap/* @fabaff @freekode @nzapponi
@@ -453,6 +454,7 @@ homeassistant/components/tado/* @michaelarnauts @bdraco
 homeassistant/components/tag/* @balloob @dmulcahey
 homeassistant/components/tahoma/* @philklei
 homeassistant/components/tankerkoenig/* @guillempages
+homeassistant/components/tapsaff/* @bazwilliams
 homeassistant/components/tasmota/* @emontnemery
 homeassistant/components/tautulli/* @ludeeus
 homeassistant/components/tellduslive/* @fredrike
diff --git a/homeassistant/components/openhome/manifest.json b/homeassistant/components/openhome/manifest.json
index 3a94215a7b1..98fbf2d961a 100644
--- a/homeassistant/components/openhome/manifest.json
+++ b/homeassistant/components/openhome/manifest.json
@@ -3,5 +3,5 @@
   "name": "Linn / OpenHome",
   "documentation": "https://www.home-assistant.io/integrations/openhome",
   "requirements": ["openhomedevice==0.7.2"],
-  "codeowners": []
+  "codeowners": ["@bazwilliams"]
 }
diff --git a/homeassistant/components/tapsaff/manifest.json b/homeassistant/components/tapsaff/manifest.json
index 7d78491ad14..30b9a2066cd 100644
--- a/homeassistant/components/tapsaff/manifest.json
+++ b/homeassistant/components/tapsaff/manifest.json
@@ -3,5 +3,5 @@
   "name": "Taps Aff",
   "documentation": "https://www.home-assistant.io/integrations/tapsaff",
   "requirements": ["tapsaff==0.2.1"],
-  "codeowners": []
+  "codeowners": ["@bazwilliams"]
 }