diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbb8182..5f17e5c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -128,12 +128,12 @@ jobs:
           if-no-files-found: ignore
 
   # ===========================================================================
-  # macOS Signing and Notarization (Release only)
+  # macOS Signing and Notarization
   # ===========================================================================
   sign-macos:
     name: Sign & Notarize (macOS)
     needs: build
-    if: github.event_name == 'release'
+    if: (github.event_name == 'release' || github.event_name == 'workflow_dispatch')
     runs-on: macos-14
 
     steps:
@@ -156,9 +156,6 @@ jobs:
           rmdir "$SUBDIR"
           ls -la
 
-      # -----------------------------------------------------------------------
-      # Install Apple Certificates
-      # -----------------------------------------------------------------------
       - name: Install Apple Certificates
         env:
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
@@ -186,9 +183,6 @@ jobs:
           IDENTITY=$(security find-identity -v -p codesigning $KEYCHAIN_PATH | grep "Developer ID Application" | head -1 | awk -F'"' '{print $2}')
           echo "APPLE_CODE_SIGN_IDENTITY_APP=$IDENTITY" >> $GITHUB_ENV
 
-      # -----------------------------------------------------------------------
-      # Setup Notarization Credentials
-      # -----------------------------------------------------------------------
       - name: Setup Notarization
         env:
           NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
@@ -201,9 +195,6 @@ jobs:
             --team-id "$NOTARIZATION_TEAM_ID"
           echo "APPLE_NOTARIZE_KEYCHAIN_PROFILE=notarize-profile" >> $GITHUB_ENV
 
-      # -----------------------------------------------------------------------
-      # Sign and Notarize
-      # -----------------------------------------------------------------------
       - name: Sign and Notarize
         env:
           ENTITLEMENTS_FILE: ${{ github.workspace }}/app.entitlements
@@ -226,17 +217,10 @@ jobs:
             ./scripts/sign_and_notarize.sh "$CLI_PATH" --notarize
           fi
 
-      # -----------------------------------------------------------------------
-      # Repackage
-      # -----------------------------------------------------------------------
       - name: Repackage
         run: |
           cd packages
 
-          # Debug: show what we have
-          echo "Contents of packages directory:"
-          ls -la
-
           # Remove original unsigned package
           rm -f *.tar.gz
 
@@ -245,8 +229,9 @@ jobs:
           echo "Detected version: $VERSION"
 
           # Create signed package with CLI and its Frameworks (universal binary)
+          # Note: LabRecorder.cfg, LICENSE, README.md are inside LabRecorder.app/Contents/MacOS/
           tar -cvzf "LabRecorder-${VERSION}-macOS_universal-signed.tar.gz" \
-            LabRecorder.app LabRecorderCLI Frameworks LabRecorder.cfg LICENSE README.md
+            LabRecorder.app LabRecorderCLI Frameworks
 
           echo "Created package:"
           ls -la *.tar.gz
@@ -257,19 +242,13 @@ jobs:
           name: package-macos-signed
           path: packages/*-signed.tar.gz
 
-      - name: Upload to Release
-        if: github.event_name == 'release'
-        uses: softprops/action-gh-release@v2
-        with:
-          files: packages/*-signed.tar.gz
-
   # ===========================================================================
-  # Upload unsigned packages to release
+  # Upload packages to release
   # ===========================================================================
   release:
     name: Upload to Release
-    needs: build
-    if: github.event_name == 'release'
+    needs: [build, sign-macos]
+    if: github.event_name == 'release' && !failure() && !cancelled()
     runs-on: ubuntu-latest
 
     steps:
@@ -282,6 +261,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            artifacts/**/*.zip
+            artifacts/package-macos-signed/*.tar.gz
             artifacts/package-ubuntu-*/*.tar.gz
-            artifacts/**/*.deb
+            artifacts/package-ubuntu-*/*.deb
+            artifacts/package-windows-*/*.zip