diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 73c3609aa05ee22c7d64187e6748e3859017c2ba..32bc89e6f658f191743f5888e2423f7d86978731 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,10 +14,10 @@
 /etc/** @jboeuf @nicolasnoble @a11r @ctiller
 /examples/node/** @murgatroid99 @a11r @nicolasnoble @ctiller
 /include/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/src/core/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/src/core/lib/iomgr/*_uv.c @murgatroid99 @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/src/core/lib/iomgr/*_uv.h @murgatroid99 @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/src/cpp/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
+/src/core/** @ctiller @markdroth @dgquintas
+/src/core/lib/iomgr/*_uv.c @murgatroid99 @ctiller @markdroth @dgquintas
+/src/core/lib/iomgr/*_uv.h @murgatroid99 @ctiller @markdroth @dgquintas
+/src/cpp/** @ctiller @markdroth @dgquintas
 /src/csharp/** @jtattermusch @apolcyn @a11r @nicolasnoble @ctiller
 /src/node/** @murgatroid99 @a11r @nicolasnoble @ctiller
 /src/objective-c/** @muxi @makdharma @a11r @nicolasnoble @ctiller
@@ -25,9 +25,9 @@
 /src/python/** @nathanielmanistaatgoogle @kpayson64 @a11r @nicolasnoble @ctiller
 /src/ruby/** @apolcyn @murgatroid99 @a11r @nicolasnoble @ctiller
 /test/build/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/test/core/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/test/cpp/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
-/test/cpp/qps/** @vjpai @ctiller @markdroth @dgquintas @a11r @nicolasnoble
+/test/core/** @ctiller @markdroth @dgquintas
+/test/cpp/** @ctiller @markdroth @dgquintas
+/test/cpp/qps/** @vjpai @ctiller @markdroth @dgquintas
 /test/distrib/node/** @murgatroid99 @a11r @nicolasnoble @ctiller
 /tools/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller
 /tools/codegen/core/** @ctiller @dgquintas @markdroth
diff --git a/src/core/OWNERS b/src/core/OWNERS
index 8dca75ce91618e3c236d726b994062f17948ca7f..986c9a1c3c634522384ffd2d4e73791728804d6f 100644
--- a/src/core/OWNERS
+++ b/src/core/OWNERS
@@ -1,3 +1,4 @@
+set noparent
 @ctiller
 @markdroth
 @dgquintas
diff --git a/src/cpp/OWNERS b/src/cpp/OWNERS
index 8dca75ce91618e3c236d726b994062f17948ca7f..986c9a1c3c634522384ffd2d4e73791728804d6f 100644
--- a/src/cpp/OWNERS
+++ b/src/cpp/OWNERS
@@ -1,3 +1,4 @@
+set noparent
 @ctiller
 @markdroth
 @dgquintas
diff --git a/test/core/OWNERS b/test/core/OWNERS
index 8dca75ce91618e3c236d726b994062f17948ca7f..986c9a1c3c634522384ffd2d4e73791728804d6f 100644
--- a/test/core/OWNERS
+++ b/test/core/OWNERS
@@ -1,3 +1,4 @@
+set noparent
 @ctiller
 @markdroth
 @dgquintas
diff --git a/test/cpp/OWNERS b/test/cpp/OWNERS
index 8dca75ce91618e3c236d726b994062f17948ca7f..986c9a1c3c634522384ffd2d4e73791728804d6f 100644
--- a/test/cpp/OWNERS
+++ b/test/cpp/OWNERS
@@ -1,3 +1,4 @@
+set noparent
 @ctiller
 @markdroth
 @dgquintas