diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c5df913b84..0fea81fd7b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,7 +9,7 @@
 /eng/common/                    @dotnet-maestro-bot
 /eng/Versions.props             @dotnet-maestro-bot @dougbu
 /eng/Version.Details.xml        @dotnet-maestro-bot @dougbu
-/src/Components/                @SteveSandersonMS @aspnet-blazor-eng
+/src/Components/                @SteveSandersonMS @dotnet/aspnet-blazor-eng
 /src/DefaultBuilder/            @tratcher
 /src/Hosting/                   @tratcher
 /src/Http/                      @tratcher @jkotalik
@@ -17,8 +17,8 @@
 /src/Middleware/HttpsPolicy/    @jkotalik
 /src/Middleware/Rewrite/        @jkotalik
 # /src/ProjectTemplates/        @ryanbrandenburg
-/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/  @aspnet-blazor-eng
-/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/  @aspnet-blazor-eng
+/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/  @dotnet/aspnet-blazor-eng
+/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/  @dotnet/aspnet-blazor-eng
 /src/Security/                  @tratcher
 /src/Servers/                   @tratcher @jkotalik @halter73
 /src/Shared/runtime/            @dotnet/http