diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 90505bba..aa44721a 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -1,6 +1,9 @@
 name: "Build: Android"
 on:
   workflow_dispatch:
+    keystore:
+      type: string
+      description: base64 keystore
   workflow_call:
   push:
     branches: [ "main" ]
@@ -37,7 +40,7 @@ jobs:
         with:
           fileName: 'keystore.jks'
           fileDir: './'
-          encodedString: ${{ secrets.KEYSTORE }}
+          encodedString: ${{ github.event.inputs.keystore || secrets.KEYSTORE }}
 
       - name: 'Build Android Release'
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5190e6d7..fa2f3019 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,6 +14,8 @@ env:
 jobs:
   android-build:
     uses: KoalaSat/nostros/.github/workflows/android-build.yml@main
+    with:
+      keystore: ${{ secrets.KEYSTORE }}
   release:
     needs: [android-build]
     runs-on: ubuntu-latest