diff --git a/CODEOWNERS b/CODEOWNERS
index e99fe9da6f6..d48556da921 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1880,8 +1880,8 @@ build.json @home-assistant/supervisor
 /tests/components/webostv/ @thecode
 /homeassistant/components/websocket_api/ @home-assistant/core
 /tests/components/websocket_api/ @home-assistant/core
-/homeassistant/components/weheat/ @jesperraemaekers
-/tests/components/weheat/ @jesperraemaekers
+/homeassistant/components/weheat/ @barryvdh
+/tests/components/weheat/ @barryvdh
 /homeassistant/components/wemo/ @esev
 /tests/components/wemo/ @esev
 /homeassistant/components/whirlpool/ @abmantis @mkmer
diff --git a/homeassistant/components/weheat/manifest.json b/homeassistant/components/weheat/manifest.json
index 83a933654ec..d89b0f828db 100644
--- a/homeassistant/components/weheat/manifest.json
+++ b/homeassistant/components/weheat/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "weheat",
   "name": "Weheat",
-  "codeowners": ["@jesperraemaekers"],
+  "codeowners": ["@barryvdh"],
   "config_flow": true,
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/weheat",