diff --git a/CODEOWNERS b/CODEOWNERS
index c19f4cbc721..891f0e37f72 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -147,7 +147,7 @@ homeassistant/components/ephember/* @ttroy50
 homeassistant/components/epson/* @pszafer
 homeassistant/components/epsonworkforce/* @ThaStealth
 homeassistant/components/eq3btsmart/* @rytilahti
-homeassistant/components/esphome/* @OttoWinter
+homeassistant/components/esphome/* @OttoWinter @jesserockz
 homeassistant/components/essent/* @TheLastProject
 homeassistant/components/evohome/* @zxdavb
 homeassistant/components/ezviz/* @RenierM26 @baqs
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index b732713335e..e5992c84358 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -5,7 +5,7 @@
   "documentation": "https://www.home-assistant.io/integrations/esphome",
   "requirements": ["aioesphomeapi==2.9.0"],
   "zeroconf": ["_esphomelib._tcp.local."],
-  "codeowners": ["@OttoWinter"],
+  "codeowners": ["@OttoWinter", "@jesserockz"],
   "after_dependencies": ["zeroconf", "tag"],
   "iot_class": "local_push"
 }