diff --git a/CODEOWNERS b/CODEOWNERS
index 83651f4ddc0..9e1cd87ca80 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -721,8 +721,8 @@ build.json @home-assistant/supervisor
 /tests/components/motion_blinds/ @starkillerOG
 /homeassistant/components/motioneye/ @dermotduffy
 /tests/components/motioneye/ @dermotduffy
-/homeassistant/components/mqtt/ @emontnemery
-/tests/components/mqtt/ @emontnemery
+/homeassistant/components/mqtt/ @emontnemery @jbouwh
+/tests/components/mqtt/ @emontnemery @jbouwh
 /homeassistant/components/msteams/ @peroyvind
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
diff --git a/homeassistant/components/mqtt/manifest.json b/homeassistant/components/mqtt/manifest.json
index fa6dc8f655b..f90d02b11f4 100644
--- a/homeassistant/components/mqtt/manifest.json
+++ b/homeassistant/components/mqtt/manifest.json
@@ -5,7 +5,7 @@
   "documentation": "https://www.home-assistant.io/integrations/mqtt",
   "requirements": ["paho-mqtt==1.6.1"],
   "dependencies": ["file_upload", "http"],
-  "codeowners": ["@emontnemery"],
+  "codeowners": ["@emontnemery", "@jbouwh"],
   "iot_class": "local_push",
   "quality_scale": "gold"
 }