diff --git a/.github/workflows/generate_apk.yml b/.github/workflows/generate_apk.yml
index 6dec683148..5347e77fe3 100644
--- a/.github/workflows/generate_apk.yml
+++ b/.github/workflows/generate_apk.yml
@@ -48,9 +48,9 @@ on:
         type: string
 
 env:
-  KEYSTORE_PASSWORD: android
-  KEYSTORE_ALIAS: key0
-  KEYSTORE_ALIAS_PASSWORD: android
+  NON_PROD_RELEASE_STORE_PASSWORD: android
+  NON_PROD_RELEASE_KEY_ALIAS: navi
+  NON_PROD_RELEASE_KEY_PASSWORD: android
 
 jobs:
   generate:
@@ -84,15 +84,15 @@ jobs:
         run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1"
       - name: Grant Execute Permission for Gradle Wrapper
         run: chmod +x gradlew
-      - name: Generate Release Keystore
+      - name: Set up Release Build Configuration
         if: inputs.type == 'release'
-        run: keytool -genkey -v -keystore app/navi-release-key.jks -storepass $KEYSTORE_PASSWORD -alias $KEYSTORE_ALIAS -keypass $KEYSTORE_ALIAS_PASSWORD -keyalg RSA -keysize 2048 -validity 10000 -dname "cn=Android Build CI, ou=Android Team, o=Navi, l=Bengaluru, st=Karnataka, c=IN"
+        run: cp keystore/navi-non-prod-release-key.jks app/navi-release-key.jks
       - name: Build - APK - ${{ inputs.environment }}-${{ inputs.type }}
         if: inputs.output == 'APK'
-        run: ./gradlew package${{ inputs.environment }}${{ inputs.type }}UniversalApk --stacktrace -PRELEASE_STORE_PASSWORD=$KEYSTORE_PASSWORD -PRELEASE_KEY_ALIAS=$KEYSTORE_ALIAS -PRELEASE_KEY_PASSWORD=$KEYSTORE_ALIAS_PASSWORD
+        run: ./gradlew package${{ inputs.environment }}${{ inputs.type }}UniversalApk --stacktrace -PRELEASE_STORE_PASSWORD=$NON_PROD_RELEASE_STORE_PASSWORD -PRELEASE_KEY_ALIAS=$NON_PROD_RELEASE_KEY_ALIAS -PRELEASE_KEY_PASSWORD=$NON_PROD_RELEASE_KEY_PASSWORD
       - name: Build - AAB - ${{ inputs.environment }}-${{ inputs.type }}
         if: inputs.output == 'AAB'
-        run: ./gradlew :app:bundle${{ inputs.environment }}${{ inputs.type }} --stacktrace -PRELEASE_STORE_PASSWORD=$KEYSTORE_PASSWORD -PRELEASE_KEY_ALIAS=$KEYSTORE_ALIAS -PRELEASE_KEY_PASSWORD=$KEYSTORE_ALIAS_PASSWORD
+        run: ./gradlew :app:bundle${{ inputs.environment }}${{ inputs.type }} --stacktrace -PRELEASE_STORE_PASSWORD=$NON_PROD_RELEASE_STORE_PASSWORD -PRELEASE_KEY_ALIAS=$NON_PROD_RELEASE_KEY_ALIAS -PRELEASE_KEY_PASSWORD=$NON_PROD_RELEASE_KEY_PASSWORD
       - name: Upload - ${{ inputs.output }} - ${{ inputs.environment }}-${{ inputs.type }}
         uses: actions/upload-artifact@v3
         with:
diff --git a/app/build.gradle b/app/build.gradle
index fa6f3b05a3..1f6b7a58d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@ android {
     }
     signingConfigs {
         debug {
-            storeFile file('../keystore/debug.keystore')
+            storeFile file('../keystore/navi-debug-key.jks')
             storePassword "android"
             keyAlias "androiddebugkey"
             keyPassword "android"
diff --git a/keystore/debug.keystore b/keystore/navi-debug-key.jks
similarity index 100%
rename from keystore/debug.keystore
rename to keystore/navi-debug-key.jks
diff --git a/keystore/navi-non-prod-release-key.jks b/keystore/navi-non-prod-release-key.jks
new file mode 100644
index 0000000000..be23a34a27
Binary files /dev/null and b/keystore/navi-non-prod-release-key.jks differ