diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68efdb5ef69..ebc99c3f3c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,13 +14,13 @@ jobs:
       - name: Set up JDK
         uses: oracle-actions/setup-java@v1
         with:
-          release: 21
+          release: 23
 
       - name: Set jadx version
         uses: actions/github-script@v7
         with:
           script: |
-            const jadxVersion = github.event.release.tag_name
+            const jadxVersion = context.ref.split('/').pop()
             core.exportVariable('JADX_VERSION', jadxVersion);
 
       - name: Setup Gradle
@@ -35,9 +35,10 @@ jobs:
           name: ${{ format('jadx-gui-{0}-with-jre-win', env.JADX_VERSION) }}
           path: ${{ format('build/distWinWithJre/jadx-gui-{0}-with-jre-win.zip', env.JADX_VERSION) }}
           if-no-files-found: error
-          retention-days: 14
+          retention-days: 1
 
   release:
+    needs: build-release-win-bundle
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -52,7 +53,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const jadxVersion = github.event.release.tag_name
+            const jadxVersion = context.ref.split('/').pop()
             const releaseName = jadxVersion.substring(1)
 
             core.exportVariable('JADX_VERSION', jadxVersion);
@@ -75,7 +76,7 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
-          name: ${{ env.JADX_RELEASE_NAME) }}
+          name: ${{ env.JADX_RELEASE_NAME }}
           draft: true
           files: |
             ${{ format('build/jadx-{0}.zip', env.JADX_VERSION) }}