diff --git a/.github/workflows/release-android.yaml b/.github/workflows/release-android.yaml
index d5ee2b83..d3230fce 100644
--- a/.github/workflows/release-android.yaml
+++ b/.github/workflows/release-android.yaml
@@ -25,8 +25,6 @@ on:
         required: true
       firebase-app-id:
         required: true
-      firebase-token:
-        required: true
       relay-url:
         description: 'WalletConnect Relay URL'
         required: false
@@ -36,6 +34,8 @@ on:
         required: true
       secrets-file:
         required: true
+      keystore:
+        required: true
 
 jobs:
   build:
@@ -67,7 +67,7 @@ jobs:
 
       - run: touch ${{ inputs.path }}/.env.${{ inputs.release-type }} && echo "ENV_PROJECT_ID=${{ secrets.project-id }}\nENV_RELAY_URL=${{ secrets.relay-url }}\nENV_SENTRY_DSN=${{ secrets.sentry-dns }}\nENV_SENTRY_TAG=${{ inputs.release-type }}" >> ${{ inputs.path }}/.env.${{ inputs.release-type }}
       - run: touch ${{ inputs.path }}/android/sentry.properties && echo "${{ secrets.sentry-file }}" >> ${{ inputs.path }}/android/sentry.properties
-      - run: touch ${{ inputs.path }}/android/secrets.properties && echo "${{ secrets.secrets-file }}" >> ${{ inputs.path }}/android/secrets.properties
+      - run: touch ${{ inputs.path }}/android/app/${{ secrets.WC_INTERNAL_KEYSTORE_NAME }}.keystore && echo "${{ secrets.WC_INTERNAL_KEYSTORE }}" >> ${{ inputs.path }}/android/app/${{ secrets.WC_INTERNAL_KEYSTORE_NAME }}.keystore
       
       - name: Build APK
         run: cd ${{ inputs.path }} && yarn install && yarn run android:build:internal
@@ -76,7 +76,7 @@ jobs:
         uses: w9jds/setup-firebase@main
         with:
           tools-version: 13.0.1
-          firebase_token: ${{ secrets.firebase-token }}
+          firebase_token: ${{ secrets.FIREBASE_TOKEN }}
       
       - name: Upload APK
         env:
diff --git a/.github/workflows/release-dapp-internal.yaml b/.github/workflows/release-dapp-internal.yaml
index 4194a942..ea7facfe 100644
--- a/.github/workflows/release-dapp-internal.yaml
+++ b/.github/workflows/release-dapp-internal.yaml
@@ -14,5 +14,4 @@ jobs:
       sentry-dns: ${{ secrets.W3M_WAGMI_SENTRY_DSN }}
       sentry-file: ${{ secrets.W3M_WAGMI_SENTRY_FILE }}
       secrets-file: ${{ secrets.W3M_WAGMI_ANDROID_SECRETS }}
-      firebase-token: ${{ secrets.FIREBASE_TOKEN }}
       firebase-app-id: ${{ secrets.W3M_WAGMI_ANDROID_INTERNAL_FIREBASE_APP_ID }}