diff --git a/CODEOWNERS b/CODEOWNERS
index aa4b5547d2c..e5d009cc7a5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -154,7 +154,7 @@ homeassistant/components/netdata/* @fabaff
 homeassistant/components/nissan_leaf/* @filcole
 homeassistant/components/nmbs/* @thibmaek
 homeassistant/components/no_ip/* @fabaff
-homeassistant/components/notify/* @flowolf
+homeassistant/components/notify/* @home-assistant/core
 homeassistant/components/nsw_fuel_station/* @nickw444
 homeassistant/components/nuki/* @pschmitt
 homeassistant/components/ohmconnect/* @robbiet480
@@ -247,7 +247,7 @@ homeassistant/components/xfinity/* @cisasteelersfan
 homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
 homeassistant/components/xiaomi_miio/* @rytilahti @syssi
 homeassistant/components/xiaomi_tv/* @fattdev
-homeassistant/components/xmpp/* @fabaff
+homeassistant/components/xmpp/* @fabaff @flowolf
 homeassistant/components/yamaha_musiccast/* @jalmeroth
 homeassistant/components/yeelight/* @rytilahti @zewelor
 homeassistant/components/yeelightsunflower/* @lindsaymarkward
diff --git a/homeassistant/components/notify/manifest.json b/homeassistant/components/notify/manifest.json
index 22c85723cb8..bad39a1cb97 100644
--- a/homeassistant/components/notify/manifest.json
+++ b/homeassistant/components/notify/manifest.json
@@ -5,6 +5,6 @@
   "requirements": [],
   "dependencies": [],
   "codeowners": [
-    "@flowolf"
+    "@home-assistant/core"
   ]
 }
diff --git a/homeassistant/components/xmpp/manifest.json b/homeassistant/components/xmpp/manifest.json
index d8e4e5c4da6..3d2c3a5e911 100644
--- a/homeassistant/components/xmpp/manifest.json
+++ b/homeassistant/components/xmpp/manifest.json
@@ -7,6 +7,7 @@
   ],
   "dependencies": [],
   "codeowners": [
-    "@fabaff"
+    "@fabaff",
+    "@flowolf"
   ]
 }