diff --git a/.mergify.yml b/.mergify.yml
index 555decc527..0486ee8ad1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -22,7 +22,7 @@ pull_request_rules:
     - name: Automatic strict merge
       conditions:
           - base=master
-          - "#approved-reviews-by>=3"
+          - "#approved-reviews-by>=2"
           - "#changes-requested-reviews-by=0"
           - "#review-requested=0"
           - status-success="Validate"
diff --git a/CODEOWNERS b/CODEOWNERS
index 44346c409f..56049a5949 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,41 +1,41 @@
 # Default
-*                                           @box/webapp @box/owners
+*                                           @box/webapp
 
 # Root
-/*                                          @box/ui-elements @box/owners
-/LICENSE                                    @box/ui-elements @box/owners
-/THIRD_PARTY_LICENSES                       @box/ui-elements @box/owners
+/*                                          @box/ui-elements
+/LICENSE                                    @box/ui-elements
+/THIRD_PARTY_LICENSES                       @box/ui-elements
 
 # Source
-/src/                                       @box/webapp @box/owners
-/src/*                                      @box/preview @box/ui-elements @box/owners
-/src/api/                                   @box/preview @box/ui-elements @box/owners
-/src/api/box-edit/                          @box/partners @box/owners
-/src/api/Feed.js                            @box/preview @box/owners
-/src/api/uploads/                           @box/create-communicate @box/owners
-/src/elements/                              @box/preview @box/ui-elements @box/owners
-/src/elements/content-explorer/             @box/ui-elements @box/owners
-/src/elements/content-open-with/            @box/partners @box/owners
-/src/elements/content-picker/               @box/ui-elements @box/owners
-/src/elements/content-preview/              @box/preview @box/owners
-/src/elements/content-sharing/              @box/partners @box/owners
-/src/elements/content-sidebar/              @box/preview @box/owners
-/src/elements/content-uploader/             @box/create-communicate @box/owners
-/src/elements/wrappers/                     @box/ui-elements @box/owners
-/src/features/                              @box/webapp @box/owners
-/src/features/access-stats/                 @box/preview @box/owners
-/src/features/content-insights/             @box/preview @box/owners
-/src/features/item-details/                 @box/preview @box/owners
-/src/features/metadata-based-view/          @box/ui-elements @box/owners
-/src/features/metadata-instance-editor/     @box/ui-elements @box/owners
-/src/styles/constants/                      @box/ui-elements @box/owners
+/src/                                       @box/webapp
+/src/*                                      @box/preview @box/ui-elements
+/src/api/                                   @box/preview @box/ui-elements
+/src/api/box-edit/                          @box/partners
+/src/api/Feed.js                            @box/preview
+/src/api/uploads/                           @box/create-communicate
+/src/elements/                              @box/preview @box/ui-elements
+/src/elements/content-explorer/             @box/ui-elements
+/src/elements/content-open-with/            @box/partners
+/src/elements/content-picker/               @box/ui-elements
+/src/elements/content-preview/              @box/preview
+/src/elements/content-sharing/              @box/partners
+/src/elements/content-sidebar/              @box/preview
+/src/elements/content-uploader/             @box/create-communicate
+/src/elements/wrappers/                     @box/ui-elements
+/src/features/                              @box/webapp
+/src/features/access-stats/                 @box/preview
+/src/features/content-insights/             @box/preview
+/src/features/item-details/                 @box/preview
+/src/features/metadata-based-view/          @box/ui-elements
+/src/features/metadata-instance-editor/     @box/ui-elements
+/src/styles/constants/                      @box/ui-elements
 
 # Tests
-/test/                                      @box/webapp @box/owners
-/test/integration/                          @box/webapp @box/owners
-/test/integration/content-explorer/         @box/ui-elements @box/owners
-/test/integration/content-open-with/        @box/partners @box/owners
-/test/integration/content-picker/           @box/ui-elements @box/owners
-/test/integration/content-preview/          @box/preview @box/owners
-/test/integration/content-sidebar/          @box/preview @box/owners
-/test/integration/content-uploader/         @box/create-communicate @box/owners
+/test/                                      @box/webapp
+/test/integration/                          @box/webapp
+/test/integration/content-explorer/         @box/ui-elements
+/test/integration/content-open-with/        @box/partners
+/test/integration/content-picker/           @box/ui-elements
+/test/integration/content-preview/          @box/preview
+/test/integration/content-sidebar/          @box/preview
+/test/integration/content-uploader/         @box/create-communicate