diff --git a/CODEOWNERS b/CODEOWNERS
index 26b8e8b158b..e8fadc9ed44 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -61,6 +61,7 @@ homeassistant/components/brother/* @bieniu
 homeassistant/components/brunt/* @eavanvalkenburg
 homeassistant/components/bt_smarthub/* @jxwolstenholme
 homeassistant/components/buienradar/* @mjj4791 @ties
+homeassistant/components/cast/* @emontnemery
 homeassistant/components/cert_expiry/* @Cereal2nd @jjlawren
 homeassistant/components/cisco_ios/* @fbradyirl
 homeassistant/components/cisco_mobility_express/* @fbradyirl
@@ -236,7 +237,7 @@ homeassistant/components/modbus/* @adamchengtkc @janiversen
 homeassistant/components/monoprice/* @etsinko
 homeassistant/components/moon/* @fabaff
 homeassistant/components/mpd/* @fabaff
-homeassistant/components/mqtt/* @home-assistant/core
+homeassistant/components/mqtt/* @home-assistant/core @emontnemery
 homeassistant/components/msteams/* @peroyvind
 homeassistant/components/myq/* @bdraco
 homeassistant/components/mysensors/* @MartinHjelmare
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index e8817507672..f054c7c8e42 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -6,5 +6,5 @@
   "requirements": ["pychromecast==4.2.0"],
   "after_dependencies": ["cloud"],
   "zeroconf": ["_googlecast._tcp.local."],
-  "codeowners": []
+  "codeowners": ["@emontnemery"]
 }
diff --git a/homeassistant/components/mqtt/manifest.json b/homeassistant/components/mqtt/manifest.json
index c5063dc14a1..37070627477 100644
--- a/homeassistant/components/mqtt/manifest.json
+++ b/homeassistant/components/mqtt/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/mqtt",
   "requirements": ["hbmqtt==0.9.5", "paho-mqtt==1.5.0"],
   "dependencies": ["http"],
-  "codeowners": ["@home-assistant/core"]
+  "codeowners": ["@home-assistant/core", "@emontnemery"]
 }