diff --git a/OWNERS b/OWNERS
index 9fd357a81..18bd6aadc 100644
--- a/OWNERS
+++ b/OWNERS
@@ -8,30 +8,50 @@ jojwang@google.com
 sokcevic@google.com
 yiwzhang@google.com
 
+# Allow teams to self-manage who belongs to them.
+per-file BUILD_OWNERS=file://BUILD_OWNERS
+per-file CROS_OWNERS=file://CROS_OWNERS
+per-file LUCI_OWNERS=file://LUCI_OWNERS
+per-file RECLIENT_OWNERS=file://RECLIENT_OWNERS
+
+# Ninja
 per-file autoninja*=brucedawson@chromium.org
 per-file autoninja*=dpranke@google.com
-
-per-file gn*=dpranke@google.com
-
-per-file autosiso*=file://BUILD_OWNERS
+per-file autoninja*=file://BUILD_OWNERS
 per-file ninja*=dpranke@google.com
 per-file ninja*=thakis@chromium.org
-per-file ninja_reclient.py=file://BUILD_OWNERS
+per-file ninja*=file://BUILD_OWNERS
 per-file ninja_reclient.py=file://RECLIENT_OWNERS
-per-file ninjalog*=tikuta@chromium.org
 per-file post_build_ninja_summary.py=brucedawson@chromium.org
-per-file reclient_helper.py=file://BUILD_OWNERS
-per-file reclient_helper.py=file://RECLIENT_OWNERS
-per-file reclient_metrics*=file://BUILD_OWNERS
-per-file reclient_metrics*=file://RECLIENT_OWNERS
-per-file reclientreport*=file://RECLIENT_OWNERS
+per-file post_build_ninja_summary.py=file://BUILD_OWNERS
+
+# GN
+per-file gn*=dpranke@google.com
+per-file gn*=file://BUILD_OWNERS
+
+# Siso
+per-file autosiso*=file://BUILD_OWNERS
+per-file siso*=file://BUILD_OWNERS
+
+# reclient
+per-file reclient*=file://BUILD_OWNERS
+per-file reclient*=file://RECLIENT_OWNERS
+
+# Bazel
+per-file bazel*=file://CROS_OWNERS
+per-file bazel*=file://BUILD_OWNERS
+
+# Goma
+per-file goma*=file://BUILD_OWNERS
+
+# For Goma client updates
+per-file cipd_manifest*=file://BUILD_OWNERS
 
 per-file presubmit*.py=brucedawson@chromium.org
 
 per-file pylint*=vapier@chromium.org
 
-per-file bazel=file://CROS_OWNERS
-per-file bazel.py=file://CROS_OWNERS
+# ChromeOS related tooling
 per-file cbuildbot=file://CROS_OWNERS
 per-file cros=file://CROS_OWNERS
 per-file *cros_python2*=file://CROS_OWNERS
@@ -39,13 +59,6 @@ per-file cros_sdk=file://CROS_OWNERS
 per-file gerrit=file://CROS_OWNERS
 per-file repo=file://CROS_OWNERS
 per-file repo_launcher=file://CROS_OWNERS
-per-file CROS_OWNERS=file://CROS_OWNERS
-
-# for the Goma client update
-per-file cipd_manifest*=file://BUILD_OWNERS
-
-per-file BUILD_OWNERS=file://BUILD_OWNERS
-per-file siso*=file://BUILD_OWNERS
 
 # LUCI related tooling
 per-file bb*=file://LUCI_OWNERS
@@ -55,4 +68,3 @@ per-file cit*=file://LUCI_OWNERS
 per-file led*=file://LUCI_OWNERS
 per-file luci*=file://LUCI_OWNERS
 per-file vpython*=file://LUCI_OWNERS
-per-file LUCI_OWNERS=file://LUCI_OWNERS