diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d52ee1db569..63b69ac6b607 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,8 +3,8 @@ name: Build Android APK
 on:
   push:
     tags:
-      - '*.*.*'
-      - '!*-*'
+      - "*.*.*"
+      - "!*-*"
   workflow_dispatch:
 
 jobs:
@@ -91,6 +91,10 @@ jobs:
 
       - name: Build Android APK (signed)
         if: steps.keystore.outputs.has_keystore == 'true'
+        env:
+          ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
+          KEYPASS: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
+          STOREPASS: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
         run: |
           dotnet publish -c Release \
             osu.Android/osu.Android.csproj \
@@ -100,9 +104,9 @@ jobs:
             -p:ApplicationVersion="${{ github.run_number }}" \
             -p:AndroidKeyStore="true" \
             -p:AndroidSigningKeyStore="${{ github.workspace }}/osu.Android/osu.keystore" \
-            -p:AndroidSigningKeyAlias="${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}" \
-            -p:AndroidSigningKeyPass="${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}" \
-            -p:AndroidSigningStorePass="${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}"
+            -p:AndroidSigningKeyAlias="${ALIAS}" \
+            -p:AndroidSigningKeyPass="${KEYPASS}" \
+            -p:AndroidSigningStorePass="${STOREPASS}"
 
       - name: Build Android APK (unsigned)
         if: steps.keystore.outputs.has_keystore != 'true'
@@ -124,12 +128,8 @@ jobs:
           APK=$(find "$PUBLISH_DIR" -maxdepth 1 -name "*.apk" 2>/dev/null | head -1)
 
           if [ -z "$APK" ]; then
-            echo "::warning::Signed APK not found in publish directory. Falling back to bin/Release (MAY BE UNSIGNED!)"
-            APK=$(find osu.Android/bin/Release -name "*.apk" | head -1)
-          fi
-
-          if [ -z "$APK" ]; then
-            echo "::error::No APK found anywhere in bin/Release!"
+            echo "::error::Signed APK not found in publish directory ($PUBLISH_DIR)!"
+            # Use a non-restricted way to fail
             sh -c "false"
           fi
 
diff --git a/osu.Android.props b/osu.Android.props
index 619daef573a8..e81b524ba8ce 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -42,7 +42,7 @@
     <DisableFody>true</DisableFody>
   </PropertyGroup>
 
-  <Target Name="FixRuntimePackAssetTypes" AfterTargets="ResolveRuntimePackAssets;ComputeFilesToPublish">
+  <Target Name="FixRuntimePackAssetTypes" AfterTargets="ResolveRuntimePackAssets;ComputeFilesToPublish;ComputeResolvedFilesToPublishList">
     <ItemGroup>
       <RuntimePackAsset Update="@(RuntimePackAsset)" Condition="'%(Extension)' != '.dll'">
         <AssetType>native</AssetType>