diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index eccebc7a..fda46686 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -113,7 +113,7 @@ jobs:
           retention-days: 1
           
       - name: Upload artifact (Windows - MSI)
-        if: startsWith(matrix.platform, 'windows')
+        if: startsWith(matrix.platform, 'windows') && contains(matrix.tauri_bundle, 'msi')
         uses: actions/upload-artifact@v4
         with:
           name: MindWork AI Studio (Windows MSI ${{ matrix.dotnet_runtime }})
@@ -121,7 +121,7 @@ jobs:
           if-no-files-found: error
           retention-days: 1
           
-      - name: Upload artifact (Windows - NSIS)
+      - name: Upload artifact (Windows - NSIS) && contains(matrix.tauri_bundle, 'nsis')
         if: startsWith(matrix.platform, 'windows')
         uses: actions/upload-artifact@v4
         with:
@@ -131,7 +131,7 @@ jobs:
           retention-days: 1
           
       - name: Upload artifact (Linux - Debian Package)
-        if: startsWith(matrix.platform, 'ubuntu')
+        if: startsWith(matrix.platform, 'ubuntu') && contains(matrix.tauri_bundle, 'deb')
         uses: actions/upload-artifact@v4
         with:
           name: MindWork AI Studio (Debian Package ${{ matrix.dotnet_runtime }})
@@ -139,7 +139,7 @@ jobs:
           if-no-files-found: error
           retention-days: 1
           
-      - name: Upload artifact (Linux - AppImage)
+      - name: Upload artifact (Linux - AppImage) && contains(matrix.tauri_bundle, 'appimage')
         if: startsWith(matrix.platform, 'ubuntu')
         uses: actions/upload-artifact@v4
         with: