diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba4a117..82c6461 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,22 +18,22 @@ jobs:
             os: ubuntu-20.04
             target: aarch64-unknown-linux-gnu
             bin: runtipi-cli
-            name: runtipi-cli-Linux-aarch64.tar.gz
+            name: runtipi-cli-Linux-aarch64
             command: build
 
           - release_for: Linux-x86_64
             os: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
             bin: runtipi-cli
-            name: runtipi-cli-Linux-x86_64.tar.gz
+            name: runtipi-cli-Linux-x86_64
             command: build
 
-          - release_for: macOS-aarch64
-            os: macOS-latest
-            target: aarch64-apple-darwin
-            bin: runtipi-cli
-            name: runtipi-cli-Darwin-aarch64.tar.gz
-            command: build
+          # - release_for: macOS-aarch64
+          #   os: macOS-latest
+          #   target: aarch64-apple-darwin
+          #   bin: runtipi-cli
+          #   name: runtipi-cli-Darwin-aarch64
+          #   command: build
 
     runs-on: ${{ matrix.platform.os }}
     steps:
@@ -52,32 +52,49 @@ jobs:
           args: "--locked --release"
           strip: true
 
+      - name: Package as archive
+        shell: bash
+        run: |
+          cd target/${{ matrix.platform.target }}/release
+          tar czvf ../../../${{ matrix.platform.name }} ${{ matrix.platform.bin }}
+          cd -
+
       - name: Upload CLI
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.platform.name }}
-          path: target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
+          name: runtipi-cli-${{ matrix.platform.release_for }}
+          path: runtipi-cli-*
 
   release:
     runs-on: ubuntu-latest
     needs: build
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: runtipi-cli
+
+      - name: List artifacts
+        run: ls -la .
+
       - uses: rickstaa/action-create-tag@v1
+        id: create-tag
         with:
           tag: ${{ inputs.version }}
 
       - name: Create release
-        uses: actions/create-release@v1
         id: create_release
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          body: |
+            **${{ inputs.version }}**
           tag_name: ${{ inputs.version }}
-          release_name: ${{ inputs.version }}
+          name: ${{ inputs.version }}
           draft: false
           prerelease: true
-
-      - name: Download CLI artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: runtipi-cli-*.tar.gz
+          files: runtipi-*/**