diff --git a/OWNERS b/OWNERS
index 75432c46ef..86fea581df 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,19 +1,12 @@
+# Top level owners, if you can, try to look at more targeted OWNERS
 bclayton@google.com
 cwallez@chromium.org
+dneto@google.com
+dsinclair@chromium.org
 enga@chromium.org
 jiawei.shao@intel.com
 
-# Backup reviewers if needed.
-kainino@chromium.org
-
-per-file dawn.json=kainino@chromium.org
+# TODO(dawn:1337): Move this file in src/dawn.
+per-file dawn.json=file://src/dawn/OWNERS
 per-file DEPS=*
-per-file README.md=file://docs/dawn/OWNERS
-
-# Tint specific OWNERS
-amaiorano@google.com
-bclayton@chromium.org
-cwallez@chromium.org
-dneto@google.com
-jrprice@google.com
-rharrison@chromium.org
+per-file README.md=file://docs/OWNERS
diff --git a/OWNERS.dawn b/OWNERS.dawn
deleted file mode 100644
index 1856f307ef..0000000000
--- a/OWNERS.dawn
+++ /dev/null
@@ -1,11 +0,0 @@
-cwallez@chromium.org
-enga@chromium.org
-jiawei.shao@intel.com
-
-# Backup reviewers if needed.
-bclayton@google.com
-kainino@chromium.org
-
-per-file dawn.json=kainino@chromium.org
-per-file DEPS=*
-per-file README.md=file://docs/dawn/OWNERS
diff --git a/docs/dawn/OWNERS b/docs/OWNERS
similarity index 100%
rename from docs/dawn/OWNERS
rename to docs/OWNERS
diff --git a/src/dawn/OWNERS b/src/dawn/OWNERS
new file mode 100644
index 0000000000..fdc046d6a6
--- /dev/null
+++ b/src/dawn/OWNERS
@@ -0,0 +1,6 @@
+bajones@chromium.org
+cwallez@chromium.org
+enga@chromium.org
+kainino@chromium.org
+jiawei.shao@intel.com
+lokokun@google.com
diff --git a/OWNERS.tint b/src/tint/OWNERS
similarity index 69%
rename from OWNERS.tint
rename to src/tint/OWNERS
index 18239af9df..933a8fe218 100644
--- a/OWNERS.tint
+++ b/src/tint/OWNERS
@@ -1,7 +1,6 @@
 amaiorano@google.com
-bclayton@chromium.org
 bclayton@google.com
-cwallez@chromium.org
 dneto@google.com
+dsinclair@chromium.org
 jrprice@google.com
 rharrison@chromium.org
diff --git a/test/OWNERS b/test/OWNERS
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/test/OWNERS
@@ -0,0 +1 @@
+*