diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9ffb6133f445..f39a050ee957 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -277,11 +277,11 @@
 /integration/**                                    @andrewseguin @devversion
 
 # Tooling
-/.circleci/**                                      @angular/dev-infra-components
-/.yarn/**                                          @angular/dev-infra-components
-/scripts/**                                        @angular/dev-infra-components
-/test/**                                           @angular/dev-infra-components
-/tools/**                                          @angular/dev-infra-components
+/.circleci/**                                      @devversion @josephperrott
+/.yarn/**                                          @devversion @josephperrott
+/scripts/**                                        @devversion @josephperrott
+/test/**                                           @devversion @josephperrott
+/tools/**                                          @devversion @josephperrott
 
 # Public API golden files
 /tools/public_api_guard/cdk/a11y**                 @jelbourn @devversion
@@ -345,13 +345,13 @@
 /tools/public_api_guard/youtube-player/**          @andrewseguin
 
 # Misc
-/.github/**                                        @angular/dev-infra-components
-/.husky/**                                         @angular/dev-infra-components
-/.github/CODEOWNERS                                @angular/dev-infra-components @andrewseguin @jelbourn
+/.github/**                                        @devversion @josephperrott
+/.husky/**                                         @devversion @josephperrott
+/.github/CODEOWNERS                                @devversion @josephperrott @andrewseguin @jelbourn
 /.github/ISSUE_TEMPLATE/**                         @andrewseguin @jelbourn
-/.vscode/**                                        @angular/dev-infra-components @mmalerba
-/.ng-dev/**                                        @angular/dev-infra-components
+/.vscode/**                                        @devversion @josephperrott @mmalerba
+/.ng-dev/**                                        @devversion @josephperrott
 /goldens/size-test.yml                             @andrewseguin @mmalerba @crisbeto
-/goldens/**                                        @angular/dev-infra-components
-/src/*                                             @angular/dev-infra-components
-/*                                                 @angular/dev-infra-components
+/goldens/**                                        @devversion @josephperrott
+/src/*                                             @devversion @josephperrott
+/*                                                 @devversion @josephperrott