diff --git a/.github/workflows/generate_apk_diff.yml b/.github/workflows/generate_apk_diff.yml
index 7d823cb42b..3023e06ddb 100644
--- a/.github/workflows/generate_apk_diff.yml
+++ b/.github/workflows/generate_apk_diff.yml
@@ -64,7 +64,7 @@ jobs:
           script: |
             const sizeDiff = ${{ steps.apk-diff.outputs.size_diff }};
             const sizeDiffKB = Math.round(sizeDiff / 1024);
-            const codeOwners = ['@satish-prasad', '@raaj-gopal', '@rahul-bhat', '@shankar-yadav', '@maila-rajanikanth', '@adarsh-s', '@siddiboina-susai', '@amit-kumar', '@jegatheeswaran-m']; // Replace with the desired code owners' usernames
+            const codeOwners = ['@navi-android/leads', '@navi-android/owners']; // Replace with the desired code owners' usernames
             const codeOwnerTags = codeOwners.join(' '); // Join the code owner usernames with a space
             const additionalInfo = `
             APK size can increase due to various factors. Some common reasons include:
diff --git a/CODEOWNERS b/CODEOWNERS
index 7d17efef54..542ed86d16 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,11 +1,11 @@
 *                       @navi-android/leads @navi-android/owners
-*.gradle                @navi-android/leads @navi-android/app-architecture-devs
-*.pro                   @navi-android/leads @navi-android/app-architecture-devs
-*.yml                   @navi-android/leads @navi-android/app-architecture-devs
-*.jks                   @navi-android/leads @navi-android/app-architecture-devs
-/.github/               @navi-android/leads @navi-android/app-architecture-devs
-Dockerfile              @navi-android/leads @navi-android/app-architecture-devs
-google-services.json    @navi-android/leads @navi-android/app-architecture-devs
+*.gradle                @navi-android/leads @navi-android/hpc-owners
+*.pro                   @navi-android/leads @navi-android/hpc-owners
+*.yml                   @navi-android/leads @navi-android/hpc-owners
+*.jks                   @navi-android/leads @navi-android/hpc-owners
+/.github/               @navi-android/leads @navi-android/hpc-owners
+Dockerfile              @navi-android/leads @navi-android/hpc-owners
+google-services.json    @navi-android/leads @navi-android/hpc-owners
 SplashActivity.kt       @navi-android/leads @navi-android/hpc-owners
 NewDashboardActivity.kt @navi-android/leads @navi-android/hpc-owners
 HomeFragment.kt         @navi-android/leads @navi-android/hpc-owners