diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 66f201c955decbd00119452a505e363d53732f5d..61f30484d8053c6b3d70e58c925454a7f1cf8dc0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,34 +7,37 @@
 /grpc.gemspec @murgatroid99
 /package.json @murgatroid99
 /Rakefile @murgatroid99
+/*.podspec @muxi @makdharma
+/grpc.bzl @muxi @makdharma
 /bazel/** @nicolasnoble @dgquintas @ctiller
-/cmake/** @jtattermusch @a11r @nicolasnoble @ctiller
+/cmake/** @jtattermusch @a11r @nicolasnoble @ctiller @muxi @makdharma
 /doc/PROTOCOL-HTTP2.md @ejona86 @a11r @nicolasnoble @ctiller
 /doc/interop-test-descriptions.md @ejona86 @a11r @nicolasnoble @ctiller
-/etc/** @jboeuf @nicolasnoble @a11r @ctiller
-/examples/node/** @murgatroid99 @a11r @nicolasnoble @ctiller
+/etc/** @jboeuf @nicolasnoble @a11r @ctiller @muxi @makdharma
+/examples/node/** @murgatroid99 @a11r @nicolasnoble @ctiller @muxi @makdharma
+/examples/objective-c/** @muxi @makdharma @a11r @nicolasnoble @ctiller
 /examples/python/** @nathanielmanistaatgoogle @kpayson64 @mehrdada
-/include/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
+/include/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble @muxi @makdharma
 /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/csharp/** @jtattermusch @apolcyn @a11r @nicolasnoble @ctiller @muxi @makdharma
+/src/node/** @murgatroid99 @a11r @nicolasnoble @ctiller @muxi @makdharma
 /src/objective-c/** @muxi @makdharma @a11r @nicolasnoble @ctiller
-/src/php/** @stanley-cheung @murgatroid99 @a11r @nicolasnoble @ctiller
+/src/php/** @stanley-cheung @murgatroid99 @a11r @nicolasnoble @ctiller @muxi @makdharma
 /src/python/** @nathanielmanistaatgoogle @kpayson64 @mehrdada
 /src/python/grpcio/grpc_core_dependencies.py @a11y @ctiller @nicolasnoble @nathanielmanistaatgoogle @kpayson64 @mehrdada
-/src/ruby/** @apolcyn @murgatroid99 @a11r @nicolasnoble @ctiller
-/test/build/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble
+/src/ruby/** @apolcyn @murgatroid99 @a11r @nicolasnoble @ctiller @muxi @makdharma
+/test/build/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble @muxi @makdharma
 /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
+/test/distrib/node/** @murgatroid99 @a11r @nicolasnoble @ctiller @muxi @makdharma
+/tools/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller @muxi @makdharma
 /tools/codegen/core/** @ctiller @dgquintas @markdroth
 /tools/distrib/python/** @nathanielmanistaatgoogle @kpayson64 @mehrdada
-/tools/dockerfile/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller
-/tools/run_tests/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller
-/tools/run_tests/artifacts/*_node* @murgatroid99 @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller
-/tools/run_tests/helper_scripts/*_node* @murgatroid99 @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller
+/tools/dockerfile/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller @muxi @makdharma
+/tools/run_tests/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller @muxi @makdharma
+/tools/run_tests/artifacts/*_node* @murgatroid99 @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller @muxi @makdharma
+/tools/run_tests/helper_scripts/*_node* @murgatroid99 @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller @muxi @makdharma