diff --git a/CODEOWNERS b/CODEOWNERS
index 08310e49520..5783cf31cab 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -57,8 +57,8 @@ build.json @home-assistant/supervisor
 /tests/components/aladdin_connect/ @mkmer
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
 /tests/components/alarm_control_panel/ @home-assistant/core
-/homeassistant/components/alert/ @home-assistant/core
-/tests/components/alert/ @home-assistant/core
+/homeassistant/components/alert/ @home-assistant/core @frenck
+/tests/components/alert/ @home-assistant/core @frenck
 /homeassistant/components/alexa/ @home-assistant/cloud @ochlocracy
 /tests/components/alexa/ @home-assistant/cloud @ochlocracy
 /homeassistant/components/almond/ @gcampax @balloob
diff --git a/homeassistant/components/alert/manifest.json b/homeassistant/components/alert/manifest.json
index bf9724ec2b9..c2cdf20f54b 100644
--- a/homeassistant/components/alert/manifest.json
+++ b/homeassistant/components/alert/manifest.json
@@ -3,7 +3,7 @@
   "name": "Alert",
   "documentation": "https://www.home-assistant.io/integrations/alert",
   "after_dependencies": ["notify"],
-  "codeowners": ["@home-assistant/core"],
+  "codeowners": ["@home-assistant/core", "@frenck"],
   "quality_scale": "internal",
   "iot_class": "local_push"
 }