diff --git a/CODEOWNERS b/CODEOWNERS
index 3397948d7c8..b16c1e7e1f8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -967,8 +967,8 @@ build.json @home-assistant/supervisor
 /tests/components/motionblinds_ble/ @LennP @jerrybboy
 /homeassistant/components/motioneye/ @dermotduffy
 /tests/components/motioneye/ @dermotduffy
-/homeassistant/components/motionmount/ @RJPoelstra
-/tests/components/motionmount/ @RJPoelstra
+/homeassistant/components/motionmount/ @laiho-vogels
+/tests/components/motionmount/ @laiho-vogels
 /homeassistant/components/mqtt/ @emontnemery @jbouwh @bdraco
 /tests/components/mqtt/ @emontnemery @jbouwh @bdraco
 /homeassistant/components/msteams/ @peroyvind
diff --git a/homeassistant/components/motionmount/manifest.json b/homeassistant/components/motionmount/manifest.json
index 2665836ffd4..337ce776b33 100644
--- a/homeassistant/components/motionmount/manifest.json
+++ b/homeassistant/components/motionmount/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "motionmount",
   "name": "Vogel's MotionMount",
-  "codeowners": ["@RJPoelstra"],
+  "codeowners": ["@laiho-vogels"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/motionmount",
   "integration_type": "device",