diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index d7386d783..21e965670 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -414,14 +414,14 @@ jobs:
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-
       - name: Upload pdb database
         uses: actions/upload-artifact@v4
         with:
-          name: Windows${{matrix.target}}-debug.pdb
-          path: "build/**/*.pdb"
+          name: Windows${{matrix.target}}-debug-pdbs
+          path: |
+            build/cockatrice/Release/*.pdb
+            build/servatrice/Release/*.pdb
+          if-no-files-found: error
 
       - name: Upload to release
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
@@ -432,3 +432,7 @@ jobs:
           asset_path: ${{steps.build.outputs.path}}
           asset_name: ${{steps.build.outputs.name}}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
+
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3