diff --git a/.github/workflows/release-android.yaml b/.github/workflows/release-android.yaml
index 11c43af8..742428e3 100644
--- a/.github/workflows/release-android.yaml
+++ b/.github/workflows/release-android.yaml
@@ -25,6 +25,8 @@ on:
         required: true
       firebase-app-id:
         required: true
+      firebase-token:
+        required: true
       relay-url:
         description: 'WalletConnect Relay URL'
         required: false
@@ -34,6 +36,10 @@ on:
         required: true
       secrets-file:
         required: true
+      keystore-name:
+        required: true
+      keystore:
+        required: true
 
 jobs:
   build:
@@ -66,7 +72,8 @@ 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
+      - run: touch keystore.b64 && echo "${{ secrets.keystore }}" >> keystore.b64
+      - run: base64 -d --input keystore.b64 --output ${{ inputs.path }}/android/app/${{ secrets.keystore-name }}.keystore
       
       - name: Build APK
         run: cd ${{ inputs.path }} && yarn install && yarn run android:build:internal
@@ -75,7 +82,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 ea7facfe..03a13030 100644
--- a/.github/workflows/release-dapp-internal.yaml
+++ b/.github/workflows/release-dapp-internal.yaml
@@ -15,3 +15,6 @@ jobs:
       sentry-file: ${{ secrets.W3M_WAGMI_SENTRY_FILE }}
       secrets-file: ${{ secrets.W3M_WAGMI_ANDROID_SECRETS }}
       firebase-app-id: ${{ secrets.W3M_WAGMI_ANDROID_INTERNAL_FIREBASE_APP_ID }}
+      firebase-token: ${{ secrets.FIREBASE_TOKEN }}
+      keystore-name: ${{ secrets.WC_INTERNAL_KEYSTORE_NAME }}
+      keystore: ${{ secrets.WC_INTERNAL_KEYSTORE }}