diff --git a/CODEOWNERS b/CODEOWNERS
index c0dd609233afc9defe214a1cfac5391aad20ed50..e27c9488f0af13b347b1949b8728e95828c866b1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -802,8 +802,8 @@ tests/components/ruckus_unleashed/* @gabe565
 homeassistant/components/safe_mode/* @home-assistant/core
 tests/components/safe_mode/* @home-assistant/core
 homeassistant/components/saj/* @fredericvl
-homeassistant/components/samsungtv/* @escoand @chemelli74
-tests/components/samsungtv/* @escoand @chemelli74
+homeassistant/components/samsungtv/* @escoand @chemelli74 @epenet
+tests/components/samsungtv/* @escoand @chemelli74 @epenet
 homeassistant/components/scene/* @home-assistant/core
 tests/components/scene/* @home-assistant/core
 homeassistant/components/schluter/* @prairieapps
diff --git a/homeassistant/components/samsungtv/manifest.json b/homeassistant/components/samsungtv/manifest.json
index f6046986158698e5d6a18f58c8100934aecf046b..b4aa313748265f68f7b2c77f3fd69c7ef8c337b7 100644
--- a/homeassistant/components/samsungtv/manifest.json
+++ b/homeassistant/components/samsungtv/manifest.json
@@ -28,7 +28,8 @@
   ],
   "codeowners": [
     "@escoand",
-    "@chemelli74"
+    "@chemelli74",
+    "@epenet"
   ],
   "config_flow": true,
   "iot_class": "local_polling",