diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 728f4bd..e4314ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,16 +58,20 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential cmake pkg-config libasound2-dev libclang-dev libjack-dev \
             libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev
+          cargo install cargo-bundle
 
       - name: Install dependencies (macOS)
         if: runner.os == 'macOS'
-        run: brew list cmake &>/dev/null || brew install cmake
+        run: |
+          brew list cmake &>/dev/null || brew install cmake
+          cargo install cargo-bundle
 
       - name: Install dependencies (Windows)
         if: runner.os == 'Windows'
         run: |
           choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
           echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH
+          cargo install cargo-bundle
 
       - name: Build
         run: cargo build --release --target ${{ matrix.target }}
@@ -75,6 +79,9 @@ jobs:
       - name: Build desktop
         run: cargo build --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
 
+      - name: Bundle desktop app
+        run: cargo bundle --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
+
       - name: Run tests
         run: cargo test --target ${{ matrix.target }}
 
@@ -95,19 +102,26 @@ jobs:
           name: ${{ matrix.artifact }}
           path: target/${{ matrix.target }}/release/cagire.exe
 
-      - name: Upload desktop artifact (Unix)
-        if: runner.os != 'Windows'
+      - name: Upload desktop artifact (Linux deb)
+        if: runner.os == 'Linux'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact }}-desktop
-          path: target/${{ matrix.target }}/release/cagire-desktop
+          path: target/${{ matrix.target }}/release/bundle/deb/*.deb
 
-      - name: Upload desktop artifact (Windows)
+      - name: Upload desktop artifact (macOS app bundle)
+        if: runner.os == 'macOS'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}-desktop
+          path: target/${{ matrix.target }}/release/bundle/osx/Cagire.app
+
+      - name: Upload desktop artifact (Windows MSI)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact }}-desktop
-          path: target/${{ matrix.target }}/release/cagire-desktop.exe
+          path: target/${{ matrix.target }}/release/bundle/msi/*.msi
 
   release:
     needs: build
@@ -130,10 +144,12 @@ jobs:
             name=$(basename "$dir")
             if [[ "$name" == *-desktop ]]; then
               base="${name%-desktop}"
-              if [ -f "$dir/cagire-desktop.exe" ]; then
-                cp "$dir/cagire-desktop.exe" "release/${base}-desktop.exe"
-              elif [ -f "$dir/cagire-desktop" ]; then
-                cp "$dir/cagire-desktop" "release/${base}-desktop"
+              if ls "$dir"/*.msi 1>/dev/null 2>&1; then
+                cp "$dir"/*.msi "release/${base}-desktop.msi"
+              elif ls "$dir"/*.deb 1>/dev/null 2>&1; then
+                cp "$dir"/*.deb "release/${base}-desktop.deb"
+              elif [ -d "$dir/Cagire.app" ]; then
+                (cd "$dir" && zip -r "../../release/${base}-desktop.app.zip" Cagire.app)
               fi
             else
               if [ -f "$dir/cagire.exe" ]; then
diff --git a/Cargo.toml b/Cargo.toml
index e407675..d4be589 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,3 +65,12 @@ lto = "fat"
 codegen-units = 1
 panic = "abort"
 strip = true
+
+[package.metadata.bundle.bin.cagire-desktop]
+name = "Cagire"
+identifier = "com.sova.cagire"
+icon = ["assets/Cagire.icns", "assets/Cagire.ico"]
+version = "0.1.0"
+copyright = "Copyright (c) 2025 Cagire Contributors"
+category = "Music"
+short_description = "Forth-based music sequencer with Ableton Link"
diff --git a/assets/Cagire.icns b/assets/Cagire.icns
new file mode 100644
index 0000000..04d1d1f
Binary files /dev/null and b/assets/Cagire.icns differ
diff --git a/assets/Cagire.ico b/assets/Cagire.ico
new file mode 100644
index 0000000..9b55471
Binary files /dev/null and b/assets/Cagire.ico differ