diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 46adeb389..9b2730c90 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -21,12 +21,6 @@ on:
 
 
 env:
-  JAVA_DIST: 'zulu'
-  JAVA_VERSION: '24.0.1+9'
-  #This is needed, as liberica contains JFX 24 Jmods for Windows ARM64
-  JAVA_DIST_ARM64: 'liberica'
-  JAVA_VERSION_ARM64: '24.0.1+11'
-  JAVA_PACKAGE_ARM64: 'jdk+fx'
   OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_windows-x64_bin-jmods.zip'
   OPENJFX_JMODS_AMD64_HASH: 'f13d17c7caf88654fc835f1b4e75a9b0f34a888eb8abef381796c0002e63b03f'
   WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi'
@@ -51,31 +45,25 @@ jobs:
         include:
           - arch: x64
             os: windows-latest
-            executable-suffix: x64
+            java-dist: 'zulu'
+            java-version: '24.0.1+9'
+            java-package: 'jdk'
           - arch: arm64
             os: windows-11-arm
-            executable-suffix: arm64
+            java-dist: 'liberica'
+            java-version: '24.0.1+11'
+            java-package: 'jdk+fx' #This is needed, as liberica contains JFX 24 Jmods for Windows ARM64
     env:
       LOOPBACK_ALIAS: 'cryptomator-vault'
       WIN_CONSOLE_FLAG: ''
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Java for x64
-        if: matrix.arch == 'x64'
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ env.JAVA_DIST }}
-          java-version: ${{ env.JAVA_VERSION }}
-          check-latest: true
-          cache: 'maven'
-      - uses: actions/checkout@v4
-      - name: Setup Java for arm64
-        if: matrix.arch == 'arm64'
-        uses: actions/setup-java@v4
-        with:
-          distribution: ${{ env.JAVA_DIST_ARM64 }}
-          java-version: ${{ env.JAVA_VERSION_ARM64 }}
-          java-package: ${{ env.JAVA_PACKAGE_ARM64 }}
+          distribution: ${{ matrix.java-dist }}
+          java-version: ${{ matrix.java-version }}
+          java-package: ${{ matrix.java-package }}
           check-latest: true
           cache: 'maven'
       - name: Install wix and extensions
@@ -284,7 +272,7 @@ jobs:
           timestampUrl: 'http://timestamp.digicert.com'
           folder: installer
       - name: Add possible alpha/beta tags and architecture to installer name
-        run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}.msi
+        run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}_${{ matrix.arch }}.msi
       - name: Create detached GPG signature with key 615D449FE6E6A235
         run: |
           echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
@@ -295,7 +283,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: msi-${{ matrix.executable-suffix }}
+          name: msi-${{ matrix.arch }}
           path: |
             Cryptomator-*.msi
             Cryptomator-*.asc
@@ -311,9 +299,15 @@ jobs:
           - arch: x64
             os: windows-latest
             executable-suffix: x64
+            java-dist: 'zulu'
+            java-version: '24.0.1+9'
+            java-package: 'jdk'
           - arch: arm64
             os: windows-11-arm
             executable-suffix: arm64
+            java-dist: 'liberica'
+            java-version: '24.0.1+11'
+            java-package: 'jdk+fx' #This is needed, as liberica contains JFX 24 Jmods for Windows ARM64
     steps:
       - uses: actions/checkout@v4
       - name: Install wix and extensions
@@ -324,25 +318,16 @@ jobs:
       - name: Download .msi
         uses: actions/download-artifact@v4
         with:
-          name: msi-${{ matrix.executable-suffix }}
+          name: msi-${{ matrix.arch }}
           path: dist/win/bundle/resources
       - name: Strip version info from msi file name
         run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi
-      - name: Setup Java for x64
-        uses: actions/setup-java@v4
-        if: matrix.arch == 'x64'
-        with:
-          distribution: ${{ env.JAVA_DIST }}
-          java-version: ${{ env.JAVA_VERSION }}
-          check-latest: true
-          cache: 'maven'
-      - name: Setup Java for arm64
-        if: matrix.arch == 'arm64'
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ env.JAVA_DIST_ARM64 }}
-          java-version: ${{ env.JAVA_VERSION_ARM64 }}
-          java-package: ${{ env.JAVA_PACKAGE_ARM64 }}
+          distribution: ${{ matrix.java-dist }}
+          java-version: ${{ matrix.java-version }}
+          java-package: ${{ matrix.java-package }}
           check-latest: true
           cache: 'maven'
       - name: Generate license for exe