diff --git a/.pullapprove.yml b/.pullapprove.yml
index c43432c297d35f..42513e49c8d245 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -126,209 +126,232 @@ groups:
     ############################################################
     #  Label Based Reviewers
     ############################################################
-#     codeowners-android:
-#         conditions:
-#             - "'android' in labels"
-#         reviewers:
-#             teams:
-#                 - codeowners-android
-#         reviews:
-#             request: 100
-#
+     codeowners-android:
+         type: optional
+         conditions:
+             - "'android' in labels"
+         reviewers:
+             teams:
+                 - codeowners-android
+         reviews:
+             request: 2
+
 #     codeowners-app:
+#         type: optional
 #         conditions:
 #             - "'app' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-app
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-ble:
+#         type: optional
 #         conditions:
 #             - "'ble' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-ble
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-controller:
+#         type: optional
 #         conditions:
 #             - "'controller' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-controller
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-darwin:
+#         type: optional
 #         conditions:
 #             - "'darwin' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-darwin
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-crypto:
+#         type: optional
 #         conditions:
 #             - "'crypto' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-crypto
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-inet:
+#         type: optional
 #         conditions:
 #             - "'inet' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-inet
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-core:
+#         type: optional
 #         conditions:
 #             - "'core' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-core
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-protocols:
+#         type: optional
 #         conditions:
 #             - "'protocols' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-protocols
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-shell:
+#         type: optional
 #         conditions:
 #             - "'shell' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-shell
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-support:
+#         type: optional
 #         conditions:
 #             - "'support' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-support
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-platform:
+#         type: optional
 #         conditions:
 #             - "'platform' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-platform
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-qrcode:
+#         type: optional
 #         conditions:
 #             - "'qrcode' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-qrcode
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-setup-payload:
+#         type: optional
 #         conditions:
 #             - "'setup payload' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-setup-payload
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-system:
+#         type: optional
 #         conditions:
 #             - "'system' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-system
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-test-driver:
+#         type: optional
 #         conditions:
 #             - "'test driver' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-test-driver
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-github:
+#         type: optional
 #         conditions:
 #             - "'github' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-github
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-vscode:
+#         type: optional
 #         conditions:
 #             - "'vscode' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-vscode
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-integrations:
+#         type: optional
 #         conditions:
 #             - "'integrations' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-integrations
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-transport:
+#         type: optional
 #         conditions:
 #             - "'transport' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-transport
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-scripts:
+#         type: optional
 #         conditions:
 #             - "'scripts' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-scripts
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-documentation:
+#         type: optional
 #         conditions:
 #             - "'documentation' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-documentation
 #         reviews:
-#             request: 100
+#             request: 2
 #
 #     codeowners-gn:
+#         type: optional
 #         conditions:
 #             - "'gn' in labels"
 #         reviewers:
 #             teams:
 #                 - codeowners-gn
 #         reviews:
-#             request: 100
+#             request: 2