diff --git a/CODEOWNERS b/CODEOWNERS
index bfaf15a2ca1..e4a93391aba 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -368,7 +368,7 @@ homeassistant/components/seven_segments/* @fabaff
 homeassistant/components/seventeentrack/* @bachya
 homeassistant/components/sharkiq/* @ajmarks
 homeassistant/components/shell_command/* @home-assistant/core
-homeassistant/components/shelly/* @balloob
+homeassistant/components/shelly/* @balloob @bieniu
 homeassistant/components/shiftr/* @fabaff
 homeassistant/components/shodan/* @fabaff
 homeassistant/components/sighthound/* @robmarkcole
diff --git a/homeassistant/components/shelly/manifest.json b/homeassistant/components/shelly/manifest.json
index 4f4e740a83f..f15c4fb3f0d 100644
--- a/homeassistant/components/shelly/manifest.json
+++ b/homeassistant/components/shelly/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/shelly2",
   "requirements": ["aioshelly==0.2.1"],
   "zeroconf": ["_http._tcp.local."],
-  "codeowners": ["@balloob"]
+  "codeowners": ["@balloob", "@bieniu"]
 }