diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bc81e98fccb6..5fb4301ace66 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -229,10 +229,10 @@
 /src/universal-app/**                              @jelbourn
 
 # Tooling
-/.circleci/**                                      @dev-infra-components
-/scripts/**                                        @dev-infra-components
-/test/**                                           @dev-infra-components
-/tools/**                                          @dev-infra-components
+/.circleci/**                                      @angular/dev-infra-components
+/scripts/**                                        @angular/dev-infra-components
+/test/**                                           @angular/dev-infra-components
+/tools/**                                          @angular/dev-infra-components
 
 # Public API golden files
 /tools/public_api_guard/cdk/a11y.d.ts              @jelbourn @devversion
@@ -290,7 +290,7 @@
 /tools/public_api_guard/material/material.d.ts          @jelbourn
 
 # Misc
-/*                                                 @dev-infra-components @jelbourn
-/.github/**                                        @dev-infra-components @jelbourn
-/.vscode/**                                        @dev-infra-components @mmalerba
+/*                                                 @angular/dev-infra-components @jelbourn
+/.github/**                                        @angular/dev-infra-components @jelbourn
+/.vscode/**                                        @angular/dev-infra-components @mmalerba
 /src/*                                             @jelbourn