diff --git a/CODEOWNERS b/CODEOWNERS
index c611f2d810..4f85c26ec5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,37 +1,35 @@
-*                                                                                                   @navi-android/react-native-codeowners
-/android/                                                                                           @navi-android/leads @navi-android/codeowners
-/android/navi-amc/                                                                                  @navi-android/leads @navi-android/amc-gold-codeowners
-/android/navi-gold/                                                                                 @navi-android/leads @navi-android/amc-gold-codeowners
-/android/navi-bbps/                                                                                 @navi-android/leads @navi-android/bbps-codeowners
-/android/navi_pl_dynamic/                                                                           @navi-android/leads @navi-android/cash-loan-codeowners
-/android/navi-vkyc/                                                                                 @navi-android/leads @navi-android/cash-loan-codeowners
-/android/finoramic-androidx-sdk/                                                                    @navi-android/leads @navi-android/cash-loan-codeowners
-/android/one-money-sdk/                                                                             @navi-android/leads @navi-android/cash-loan-codeowners
-/android/navi-chat/                                                                                 @navi-android/leads @navi-android/crm-alfred-codeowners
-/android/navi-insurance/                                                                            @navi-android/leads @navi-android/health-insurance-codeowners
-/android/navi-hl/                                                                                   @navi-android/leads @navi-android/home-loan-codeowners
-/android/navi_hl_dynamic/                                                                           @navi-android/leads @navi-android/home-loan-codeowners
-/android/navi-payment/                                                                              @navi-android/leads @navi-android/payment-service-codeowners
-/android/app/                                                                                       @navi-android/leads @navi-android/personalisation-experience-codeowners
-/android/navi-mqtt/                                                                                 @navi-android/leads @navi-android/personalisation-experience-codeowners
-/android/application-platform/                                                                      @navi-android/leads @navi-android/personalisation-experience-codeowners
-/android/navi-rr/                                                                                   @navi-android/leads @navi-android/rnr-experience-codeowners
-/android/navi-coin/                                                                                 @navi-android/leads @navi-android/rnr-experience-codeowners
-/android/navi-pay/                                                                                  @navi-android/leads @navi-android/upi-codeowners
-/android/navi-upi-cl/                                                                               @navi-android/leads @navi-android/upi-codeowners
-/android/app/src/main/java/com/naviapp/home/                                                        @navi-android/personalisation-experience-codeowners
-/android/app/src/main/java/com/naviapp/payment/fragments/PaymentBaseFragment.kt                     @navi-android/personalisation-experience-codeowners
-/android/keystore/                                                                                  @navi-android/critical-codeowners
-/android/gradle/                                                                                    @navi-android/critical-codeowners
-/.github/                                                                                           @navi-android/critical-codeowners
-CODEOWNERS                                                                                          @navi-android/critical-codeowners
-README.md                                                                                           @navi-android/critical-codeowners
-Dockerfile                                                                                          @navi-android/critical-codeowners
-AndroidManifest.xml                                                                                 @navi-android/critical-codeowners
-google-services.json                                                                                @navi-android/critical-codeowners
-*.gradle                                                                                            @navi-android/critical-codeowners
-*.pro                                                                                               @navi-android/critical-codeowners
-*.yml                                                                                               @navi-android/critical-codeowners
-*.jks                                                                                               @navi-android/critical-codeowners
-*.toml                                                                                              @navi-android/critical-codeowners
-*.properties                                                                                        @navi-android/critical-codeowners
+*                                       @navi-android/react-native-codeowners
+/android/                               @navi-android/codeowners
+/android/navi-amc/                      @navi-android/investments-codeowners
+/android/navi-gold/                     @navi-android/investments-codeowners
+/android/navi-bbps/                     @navi-android/bbps-codeowners
+/android/navi_pl_dynamic/               @navi-android/cash-loan-codeowners
+/android/navi-vkyc/                     @navi-android/cash-loan-codeowners
+/android/finoramic-androidx-sdk/        @navi-android/cash-loan-codeowners
+/android/one-money-sdk/                 @navi-android/cash-loan-codeowners
+/android/navi-chat/                     @navi-android/crm-codeowners
+/android/navi-insurance/                @navi-android/health-insurance-codeowners
+/android/navi-hl/                       @navi-android/home-loan-codeowners
+/android/navi_hl_dynamic/               @navi-android/home-loan-codeowners
+/android/navi-payment/                  @navi-android/payment-service-codeowners
+/android/app/                           @navi-android/personalisation-experience-codeowners
+/android/navi-mqtt/                     @navi-android/personalisation-experience-codeowners
+/android/application-platform/          @navi-android/personalisation-experience-codeowners
+/android/navi-rr/                       @navi-android/rnr-experience-codeowners
+/android/navi-coin/                     @navi-android/rnr-experience-codeowners
+/android/navi-pay/                      @navi-android/upi-codeowners
+/android/navi-upi-cl/                   @navi-android/upi-codeowners
+/android/keystore/                      @navi-android/critical-codeowners
+/android/gradle/                        @navi-android/critical-codeowners
+/.github/                               @navi-android/critical-codeowners
+CODEOWNERS                              @navi-android/critical-codeowners
+README.md                               @navi-android/critical-codeowners
+Dockerfile                              @navi-android/critical-codeowners
+AndroidManifest.xml                     @navi-android/critical-codeowners
+google-services.json                    @navi-android/critical-codeowners
+*.gradle                                @navi-android/critical-codeowners
+*.pro                                   @navi-android/critical-codeowners
+*.yml                                   @navi-android/critical-codeowners
+*.jks                                   @navi-android/critical-codeowners
+*.toml                                  @navi-android/critical-codeowners
+*.properties                            @navi-android/critical-codeowners