diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
index 5dcfba43b..5f3346784 100644
--- a/.github/workflows/publish-android.yml
+++ b/.github/workflows/publish-android.yml
@@ -5,6 +5,11 @@ on:
     tags:
       - v*
   workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag to upload artifacts to"
+        required: false
+
 
 jobs:
   build:
@@ -37,9 +42,11 @@ jobs:
         SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
     - name: Rename apk
       run: mv android/sample/build/outputs/apk/debug/sample-debug.apk SampleApp-android.apk
-    - name: Upload Sample App
-      uses: skx/github-action-publish-binaries@master
+    - name: Attach sample APK to release
+      if: ${{ github.event.inputs.tag != '' }}
+      uses: passy/github-upload-release-artifacts-action@v2.1.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
+        created_tag: ${{ github.event.inputs.tag }}
         args: 'SampleApp-android.apk'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4b031d319..5ea4409c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -202,3 +202,4 @@ jobs:
         workflow: Publish Android
         token: ${{ secrets.PERSONAL_TOKEN }}
         ref: ${{ needs.release.outputs.tag }}
+        inputs: '{"tag": "${{ needs.release.outputs.tag }}"}'