diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 92dda17649a..2e4fb471386 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -32,6 +32,18 @@
 /src/r8 @jonathanpeppers @jonpryor
 /src/Xamarin.Android.Build.Tasks @dellis1972 @jonathanpeppers
 /src/Xamarin.Android.Build.Tasks/Linker @jonpryor
+/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/TypeMap* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethods* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/*AssemblyStore* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyCompression* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembl* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData* @grendello
+/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools @grendello
 /src/Xamarin.Android.NamingCustomAttributes @jonpryor
 /src/Xamarin.Android.Tools.Aidl @jonpryor
 /src/monodroid/ @jonpryor @grendello