diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 3ad3966..7dd381f 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -23,29 +23,19 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             dependencies: "libssl-dev libasound2-dev libdbus-1-dev"
-          - os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            cross_arch: true
 
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
 
-      - name: Install Linux dependencies
-        if: matrix.dependencies
-        run: sudo apt-get update && sudo apt-get install -y ${{ matrix.dependencies }}
-
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
+      - name: Install dependencies
+        if: ${{ runner.os == 'Linux' }}
+        run: sudo apt-get update && sudo apt-get install ${{ matrix.dependencies }}
 
       - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.cross_arch }}
-          command: build
-          args: --locked --release --target ${{ matrix.target }}
+        shell: bash
+        run: |
+          cargo build --locked --release --target ${{ matrix.target }}
 
       - name: Package
         shell: bash
@@ -54,8 +44,14 @@ jobs:
           tar czvf hullcaster-${{ matrix.target }}.tar.gz hullcaster
           shasum -a 256 hullcaster-${{ matrix.target }}.tar.gz > hullcaster-${{ matrix.target }}.sha256
 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: hullcaster-${{ matrix.target }}.tar.gz
+          path: target/${{ matrix.target }}/release/hullcaster-${{ matrix.target }}.tar.gz
+
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: github.ref_type == 'tag'
         with:
           files: target/${{ matrix.target }}/release/hullcaster-*
         env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d7a73d..0c1e147 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,35 +19,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-latest
-            target: x86_64-apple-darwin
           - os: macos-latest
             target: aarch64-apple-darwin
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             dependencies: "libssl-dev libasound2-dev libdbus-1-dev"
-          - os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            cross_arch: true
-        toolchain: [1.88.0]
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install libssl-dev libasound2-dev libdbus-1-dev
         if: ${{ runner.os == 'Linux' }}
+        run: sudo apt-get update && sudo apt-get install ${{ matrix.dependencies }}
 
       - name: Checkout source
         uses: actions/checkout@v5
 
-      - name: Install Rust toolchain
-        id: install_toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.toolchain }}
-          components: clippy, rustfmt
-
       - name: Cache cargo deps
         uses: actions/cache@v4
         with: