diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1870f514c92c..79dc2134130b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -16,14 +16,14 @@
 /eng/common/                                                                      @dotnet-maestro-bot
 /eng/Versions.props                                                               @dotnet-maestro-bot @dotnet/aspnet-build @dougbu @wtgodbe
 /eng/Version.Details.xml                                                          @dotnet-maestro-bot @dotnet/aspnet-build @dougbu @wtgodbe
-/src/Caching/                                                                     @captainsafia @halter73
-/src/Caching/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @captainsafia @halter73
+/src/Caching/                                                                     @captainsafia @halter73 @mgravell
+/src/Caching/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @captainsafia @halter73 @mgravell
 /src/Components/                                                                  @dotnet/aspnet-blazor-eng
 /src/Components/**/PublicAPI.*Shipped.txt                                         @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
 /src/DefaultBuilder/                                                              @tratcher @halter73
 /src/DefaultBuilder/**/PublicAPI.*Shipped.txt                                     @dotnet/aspnet-api-review @tratcher
-/src/Grpc/                                                                        @JamesNK @captainsafia
-/src/Grpc/**/PublicAPI.*Shipped.txt                                               @dotnet/aspnet-api-review @JamesNK @captainsafia
+/src/Grpc/                                                                        @JamesNK @captainsafia @mgravell
+/src/Grpc/**/PublicAPI.*Shipped.txt                                               @dotnet/aspnet-api-review @JamesNK @captainsafia @mgravell
 /src/Hosting/                                                                     @tratcher @halter73
 /src/Hosting/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @tratcher
 /src/Http/                                                                        @tratcher @BrennanConroy @halter73
@@ -43,8 +43,8 @@
 /src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/  @dotnet/aspnet-blazor-eng
 /src/Security/                                                                    @tratcher
 /src/Security/**/PublicAPI.*Shipped.txt                                           @dotnet/aspnet-api-review @tratcher
-/src/Servers/                                                                     @tratcher @halter73 @BrennanConroy @JamesNK
-/src/Servers/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @tratcher @halter73 @BrennanConroy @JamesNK
+/src/Servers/                                                                     @tratcher @halter73 @BrennanConroy @JamesNK @mgravell
+/src/Servers/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @tratcher @halter73 @BrennanConroy @JamesNK @mgravell
 /src/Shared/runtime/                                                              @tratcher
 /src/Shared/test/Shared.Tests/runtime/                                            @tratcher
 /src/SignalR/                                                                     @BrennanConroy @halter73