diff --git a/.github/workflows/build-client.yml b/.github/workflows/build-client.yml
index c80a3a0..53730ac 100644
--- a/.github/workflows/build-client.yml
+++ b/.github/workflows/build-client.yml
@@ -89,7 +89,15 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: client-${{ matrix.os }}
-        path: Client/dist/
+        path: |
+          Client/dist/*.exe
+          Client/dist/*.msi
+          Client/dist/*.dmg
+          Client/dist/*.zip
+          Client/dist/*.AppImage
+          Client/dist/*.deb
+          Client/dist/*.rpm
+          Client/dist/*.app
         retention-days: 30
       continue-on-error: true
 
@@ -117,24 +125,27 @@ jobs:
         mkdir -p release/macOS  
         mkdir -p release/Linux
         
-        # Windows executables
+        # Windows executables - copy directly from dist
         if [ -d "artifacts/client-windows-latest" ]; then
-          find artifacts/client-windows-latest -name "*.exe" -type f -exec cp {} release/Windows/ \;
-          find artifacts/client-windows-latest -name "*.msi" -type f -exec cp {} release/Windows/ \;
+          cp artifacts/client-windows-latest/*.exe release/Windows/ 2>/dev/null || true
+          cp artifacts/client-windows-latest/*.msi release/Windows/ 2>/dev/null || true
         fi
         
-        # macOS executables
+        # macOS executables - copy directly from dist
         if [ -d "artifacts/client-macos-latest" ]; then
-          find artifacts/client-macos-latest -name "*.dmg" -type f -exec cp {} release/macOS/ \;
-          find artifacts/client-macos-latest -name "*.app" -type d -exec cp -r {} release/macOS/ \;
-          find artifacts/client-macos-latest -name "*.zip" -type f -exec cp {} release/macOS/ \;
+          cp artifacts/client-macos-latest/*.dmg release/macOS/ 2>/dev/null || true
+          cp artifacts/client-macos-latest/*.zip release/macOS/ 2>/dev/null || true
+          # Handle .app bundles (directories)
+          if [ -d "artifacts/client-macos-latest" ]; then
+            find artifacts/client-macos-latest -maxdepth 1 -name "*.app" -type d -exec cp -r {} release/macOS/ \; 2>/dev/null || true
+          fi
         fi
         
-        # Linux executables
+        # Linux executables - copy directly from dist
         if [ -d "artifacts/client-ubuntu-latest" ]; then
-          find artifacts/client-ubuntu-latest -name "*.AppImage" -type f -exec cp {} release/Linux/ \;
-          find artifacts/client-ubuntu-latest -name "*.deb" -type f -exec cp {} release/Linux/ \;
-          find artifacts/client-ubuntu-latest -name "*.rpm" -type f -exec cp {} release/Linux/ \;
+          cp artifacts/client-ubuntu-latest/*.AppImage release/Linux/ 2>/dev/null || true
+          cp artifacts/client-ubuntu-latest/*.deb release/Linux/ 2>/dev/null || true
+          cp artifacts/client-ubuntu-latest/*.rpm release/Linux/ 2>/dev/null || true
         fi
         
         # List what we actually got