diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 184013a..f08f2ac 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -1,21 +1,11 @@
 name: "Build: Android"
 on:
-  workflow_dispatch:
-    keystore:
-      type: string
-      description: base64 keystore
   workflow_call:
   push:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 
-env:
-  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-  KEY_PASS: ${{ secrets.KEY_PASS }}
-  KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
-  KEYSTORE: ${{ secrets.KEYSTORE }}
-
 jobs:
   build-android:
     runs-on: ubuntu-latest
@@ -41,12 +31,16 @@ jobs:
         with:
           fileName: 'keystore.jks'
           fileDir: './'
-          encodedString: ${{ env.KEYSTORE }}
+          encodedString: ${{ secrets.KEYSTORE }}
 
       - name: 'Build Android Release'
         run: |
           cd android
           ./gradlew assembleRelease
+        env:
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASS: ${{ secrets.KEY_PASS }}
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
 
       - name: 'Check for non-FOSS libraries'
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ebfd772..554638c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,11 +9,7 @@ on:
 jobs:
   android-build:
     uses: KoalaSat/nostros/.github/workflows/android-build.yml@main
-    env:
-      KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-      KEY_PASS: ${{ secrets.KEY_PASS }}
-      KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
-      KEYSTORE: ${{ secrets.KEYSTORE }}
+    secrets: inherit
   release:
     needs: [android-build]
     runs-on: ubuntu-latest