diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml
index 9420840..f79542b 100644
--- a/.github/workflows/release-build.yaml
+++ b/.github/workflows/release-build.yaml
@@ -408,7 +408,7 @@ jobs:
                 sudo ln -sf ${BASEDIR}/${{ env.JELLYFIN_RELEASE_TYPE }}/${{ env.JELLYFIN_VERSION }} ${BASEDIR}/latest || exit 1
             fi
 
-      - name: "Store artifact for next build"
+      - name: "Store artifact for next stage"
         uses: actions/upload-artifact@v4
         with:
           name: windows-x64
@@ -421,14 +421,12 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
-      matrix:
-        arch:
-          - amd64
+    continue-on-error: false  # true in prod, false for testing
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
     if: startsWith(inputs.jellyfin_version, 'v')
     steps:
-      - name: "Fetch artifact from previous build"
+      - name: "Fetch artifact from previous stage"
         uses: actions/download-artifact@v4
         working-directory: ./jellyfin-server-windows
         with:
@@ -473,13 +471,37 @@ jobs:
           $version = "${{ inputs.jellyfin_version }}".Substring(1)
           Rename-Item -Path .\jellyfin_*_windows-x64.exe -NewName ("jellyfin_${version}_windows-x64.exe")
         
+      - name: "Store artifact for next stage"
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-installer-x64
+          retention-days: 1
+          if-no-files-found: error
+          path: jellyfin-server-windows\jellyfin_*_windows-x64.exe
+
+  WindowsInstallerUpload:
+    needs: WindowsInstaller
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - amd64
+    continue-on-error: false  # true in prod, false for testing
+    if: startsWith(inputs.jellyfin_version, 'v')
+    steps:
+      - name: "Fetch artifact from previous stage"
+        uses: actions/download-artifact@v4
+        with:
+          name: windows-installer-x64
+
       - name: "Upload artifacts to repository server"
         uses: appleboy/scp-action@917f8b81dfc1ccd331fef9e2d61bdc6c8be94634 # v0.1.7
         with:
           host: "${{ secrets.REPO_HOST }}"
           username: "${{ secrets.REPO_USER }}"
           key: "${{ secrets.REPO_KEY }}"
-          source: "jellyfin-server-windows\jellyfin_*_windows-x64.exe"
+          source: "jellyfin_*_windows-x64.exe"
           strip_components: 1
           target: "/srv/incoming/server/${{ inputs.jellyfin_version }}/windows/${{ matrix.arch }}"