diff --git a/build_overrides/OWNERS b/build_overrides/OWNERS
index b3897fa05c43ca..6c97edf57d175e 100644
--- a/build_overrides/OWNERS
+++ b/build_overrides/OWNERS
@@ -2,3 +2,5 @@ file://build/OWNERS
 brettw@chromium.org
 machenbach@chromium.org
 kjellander@chromium.org
+
+# COMPONENT: Build
diff --git a/testing/buildbot/OWNERS b/testing/buildbot/OWNERS
index 55f1b0588eb0b0..5a13552507ba93 100644
--- a/testing/buildbot/OWNERS
+++ b/testing/buildbot/OWNERS
@@ -30,3 +30,5 @@ per-file chromium.perf.json=simonhatch@chromium.org
 per-file chromium.perf.json=sullivan@chromium.org
 per-file chromium.webrtc.json=kjellander@chromium.org
 per-file chromium.webrtc.fyi.json=kjellander@chromium.org
+
+# COMPONENT: Infra>Client