diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d1ead4a1334..92dda17649a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -16,6 +16,8 @@
 /build-tools/api-merge @jonpryor
 /build-tools/api-xml-adjuster @jonpryor
 /build-tools/automation @pjcollins @jonpryor
+/build-tools/cmake @grendello
+/build-tools/wrap-sh @grendello
 /build-tools/debian-metadata @directhex
 /build-tools/enumification-helpers @jonpryor
 /build-tools/manifest-attribute-codegen @jonpryor
@@ -33,6 +35,7 @@
 /src/Xamarin.Android.NamingCustomAttributes @jonpryor
 /src/Xamarin.Android.Tools.Aidl @jonpryor
 /src/monodroid/ @jonpryor @grendello
+/src/sqlite-xamarin @grendello
 /tests/TestRunner.* @grendello
 /tests/BCL-Tests @grendello
 /tests/CodeBehind @grendello
@@ -44,6 +47,9 @@
 /src/Mono.Android/java/mono/android/ @mcumming @jonpryor
 /src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets @mcumming @jonpryor
 
+/tools/assembly-store-reader @grendello
+/tools/decompress-assemblies @grendello
 /tools/jit-times @jonpryor
-/tools/xabuild @jonathanpeppers @jonpryor
 /tools/setup-windows @jonathanpeppers @jonpryor
+/tools/tmt @grendello
+/tools/xabuild @jonathanpeppers @jonpryor