diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index b8ab010..0000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Current reviewers-XXX teams, who review everything for approval.
-* @reviewers-amazon @reviewers-apple @reviewers-comcast @reviewers-google @reviewers-lg @reviewers-nordic @reviewers-samsung @reviewers-silabs @reviewers-tcl
diff --git a/.pullapprove.yml b/.pullapprove.yml
index 5be3f21..83d7b70 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -84,7 +84,7 @@
         reviewers:
             teams: [reviewers-amazon]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-apple:
         type: optional
         conditions:
@@ -92,7 +92,7 @@
         reviewers:
             teams: [reviewers-apple]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-bosch:
         type: optional
         conditions:
@@ -100,7 +100,7 @@
         reviewers:
             teams: [reviewers-bosch]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-comcast:
         type: optional
         conditions:
@@ -108,7 +108,7 @@
         reviewers:
             teams: [reviewers-comcast]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-dyson:
         type: optional
         conditions:
@@ -116,7 +116,7 @@
         reviewers:
             teams: [reviewers-dyson]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-espressif:
         type: optional
         conditions:
@@ -124,7 +124,7 @@
         reviewers:
             teams: [reviewers-espressif]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-google:
         type: optional
         conditions:
@@ -132,7 +132,7 @@
         reviewers:
             teams: [reviewers-google]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-grundfos:
         type: optional
         conditions:
@@ -140,7 +140,7 @@
         reviewers:
             teams: [reviewers-grundfos]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-irobot:
         type: optional
         conditions:
@@ -148,7 +148,7 @@
         reviewers:
             teams: [reviewers-irobot]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-lg:
         type: optional
         conditions:
@@ -156,7 +156,7 @@
         reviewers:
             teams: [reviewers-lg]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-logitech:
         type: optional
         conditions:
@@ -172,7 +172,7 @@
         reviewers:
             teams: [reviewers-nordic]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-nxp:
         type: optional
         conditions:
@@ -180,7 +180,7 @@
         reviewers:
             teams: [reviewers-nxp]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-samsung:
         type: optional
         conditions:
@@ -188,7 +188,7 @@
         reviewers:
             teams: [reviewers-samsung]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-eve:
         type: optional
         conditions:
@@ -196,7 +196,7 @@
         reviewers:
             teams: [reviewers-eve]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     # shared-reviewers-signify disabled for now, because the reviewers-signify
     # team is empty and pullapprove seems to mis-handle that badly and treats
     # _all_ reviewers as being in this group.
@@ -210,7 +210,7 @@
     #     reviewers:
     #         teams: [reviewers-signify]
     #     reviews:
-    #         request: 10
+    #         request: 0 # Do not auto-add
     shared-reviewers-silabs:
         type: optional
         conditions:
@@ -218,7 +218,7 @@
         reviewers:
             teams: [reviewers-silabs]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-somfy:
         type: optional
         conditions:
@@ -226,7 +226,7 @@
         reviewers:
             teams: [reviewers-somfy]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-tcl:
         type: optional
         conditions:
@@ -234,7 +234,7 @@
         reviewers:
             teams: [reviewers-tcl]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-qorvo:
         type: optional
         conditions:
@@ -242,7 +242,7 @@
         reviewers:
             teams: [reviewers-qorvo]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
 
     ############################################################
     #  Base Required Reviewers
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..970981c
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,71 @@
+/src/platform/ASR/               @tx2rx
+asr/                             @tx2rx
+chip-build-asr/                  @tx2rx
+
+/src/platform/Ameba/             @pankore
+ameba/                           @pankore
+chip-build-ameba/                @pankore
+
+/src/platform/Beken/             @zhengyaohan
+
+*.mm                             @project-chip/reviewers-apple
+darwin/                          @project-chip/reviewers-apple
+/src/darwin/                     @project-chip/reviewers-apple
+/src/platform/Darwin/            @project-chip/reviewers-apple
+/examples/darwin-framework-tool/ @project-chip/reviewers-apple
+
+/src/platform/ESP32/             @project-chip/reviewers-espressif
+esp32/                           @project-chip/reviewers-espressif
+chip-build-esp32/                @project-chip/reviewers-espressif
+chip-build-esp32-qemu/           @project-chip/reviewers-espressif
+
+/src/platform/Infineon/          @ifyall
+infineon/                        @ifyall
+chip-build-infineon/             @ifyall
+
+/src/platform/NuttX/             @zhhyu7
+chip-build-nuttx/                @zhhyu7
+
+/src/platform/Tizen/             @arkq
+tizen/                           @arkq
+chip-build-tizen/                @arkq
+chip-build-tizen-qemu/           @arkq
+
+*.java                           @project-chip/reviewers-google
+*.kt                             @project-chip/reviewers-google
+android/                         @project-chip/reviewers-google
+/src/examples/chef/              @project-chip/reviewers-google
+/integrations/appengine/         @project-chip/reviewers-google
+/integrations/cloudbuild/        @project-chip/reviewers-google
+/integrations/compute_engine/    @project-chip/reviewers-google
+chip-build-java/                 @project-chip/reviewers-google
+chip-build-android/              @project-chip/reviewers-google
+
+/src/platform/bouffalolab/       @wy-hh
+chip-build-bouffalolab/          @wy-hh
+
+cc13xx_26xx/                     @s-jain2022
+cc32xx/                          @s-jain2022
+
+/src/platform/mt793x/            @pakls
+nrfconnect/                      @project-chip/reviewers-nordic
+chip-build-nrf-platform/                      @project-chip/reviewers-nordic
+Zephyr/                            @project-chip/reviewers-nordic @project-chip/reviewers-nxp @s07641069
+
+
+nxp/                             @project-chip/reviewers-nxp
+chip-build-nxp/                  @project-chip/reviewers-nxp
+chip-build-nxp-zephyr/           @project-chip/reviewers-nxp
+chip-build-k32w/                 @project-chip/reviewers-nxp
+
+qpg/                             @dvdm-qorvo
+
+silabs/                          @project-chip/reviewers-silabs
+chip-build-efr32/                @project-chip/reviewers-silabs
+
+stm32/                           @STYoannZamaron
+
+telink/                          @s07641069
+chip-build-telink/               @s07641069
+
+webos/                           @joonhaengHeo