diff --git a/.github/actions/cache-cargo-windows/action.yml b/.github/actions/cache-cargo-windows/action.yml
index 595d323..ad12342 100644
--- a/.github/actions/cache-cargo-windows/action.yml
+++ b/.github/actions/cache-cargo-windows/action.yml
@@ -11,6 +11,6 @@ runs:
           ~/.cargo/registry
           ~/.cargo/git
           app/desktop/windows-setup/target
-        key: cargo-windows-${{ runner.os }}-${{ hashFiles('app/desktop/windows-setup/Cargo.lock', 'app/desktop/windows-setup/**/*.rs') }}
+        key: cargo-windows-${{ runner.os }}-${{ github.sha }}
         restore-keys: |
           cargo-windows-${{ runner.os }}-
diff --git a/.github/actions/setup-java-gradle/action.yml b/.github/actions/setup-java-gradle/action.yml
index a65412a..64fb816 100644
--- a/.github/actions/setup-java-gradle/action.yml
+++ b/.github/actions/setup-java-gradle/action.yml
@@ -11,10 +11,16 @@ runs:
   using: composite
   steps:
     - uses: actions/setup-java@v4
+      if: ${{ inputs.java-architecture != '' && inputs.java-architecture != 'none' }}
       with:
         distribution: temurin
         java-version: "17"
         architecture: ${{ inputs.java-architecture }}
+    - uses: actions/setup-java@v4
+      if: ${{ inputs.java-architecture == '' || inputs.java-architecture == 'none' }}
+      with:
+        distribution: temurin
+        java-version: "17"
 
     - uses: gradle/actions/setup-gradle@v4
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0e59e21..8643441 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,10 +11,13 @@ on:
         required: true
         type: string
       skip_publish:
-        description: "Build only; skip GitHub Release upload"
+        description: "Skip GitHub Release upload"
         required: false
-        type: boolean
-        default: false
+        type: choice
+        options:
+          - "false"
+          - "true"
+        default: "false"
 
 concurrency:
   group: release-${{ github.ref }}
@@ -137,7 +140,7 @@ jobs:
       matrix:
         include:
           - arch: arm64
-            java-architecture: ""
+            java-architecture: none
           - arch: x64
             java-architecture: x64
     runs-on: macos-latest
@@ -281,7 +284,7 @@ EOF
           if-no-files-found: error
 
   publish:
-    if: ${{ github.event_name != 'workflow_dispatch' || inputs.skip_publish == false }}
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.skip_publish != 'true' }}
     needs:
       - resolve-version
       - windows-package