diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2801e97..6eb1bc8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,105 +6,64 @@ on:
     tags: '*'
 
 jobs:
-  create_release:
-    name: Create release
-    runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          submodules: false
-      - name: Generate release name
-        id: release_name
-        # https://github.community/t/how-to-get-just-the-tag-name/16241/4
-        run: echo ::set-output name=name::${GITHUB_REF/refs\/*s\//}
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.release_name.outputs.name }}
-          release_name: ${{ steps.release_name.outputs.name }}
-          body: ''
-          draft: false
-          prerelease: true
-
   build:
-    name: Build
-    runs-on: ubuntu-24.04
-    needs: [create_release]
+    name: Build (${{ matrix.arch }})
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Make /opt writable and create dir
         run: sudo chown "$(whoami):$(whoami)" /opt && mkdir /opt/cegcc
       - name: Install deps
         run: |
-          sudo sed -i 's/^Types: deb/Architectures: amd64\nTypes: deb/' /etc/apt/sources.list.d/ubuntu.sources
-          sudo tee /etc/apt/sources.list.d/arm64.sources <<EOF
-          Enabled: yes
-          Types: deb
-          URIs: http://ports.ubuntu.com/
-          Suites: noble noble-updates noble-backports
-          Components: main restricted universe multiverse
-          Architectures: arm64
-          EOF
-          sudo dpkg --add-architecture arm64
-          sudo apt update
-          sudo apt install build-essential bison flex m4 libgmp-dev libmpc-dev libmpfr-dev \
-                           gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libgmp-dev:arm64 libmpc-dev:arm64 libmpfr-dev:arm64 qemu-user-static
-      - name: Build cegcc for x86_64
+          sudo apt-get update
+          sudo apt-get install -y build-essential bison flex m4 libgmp-dev libmpc-dev libmpfr-dev zip
+      - name: Build cegcc
         run: |
-          export DIR=$(pwd)
           mkdir build
           cd build
           ../build.sh -j4
           cd /opt/cegcc
           find . | xargs file | grep "not stripped" | grep -oE '^[^:]+' | xargs strip
           cd /opt
-          zip -r $DIR/cegcc-x86_64.zip cegcc
-          rm -rf cegcc
-      - name: Build cegcc for aarch64
-        run: |
-          export DIR=$(pwd)
-          mkdir cross
-          cd cross
-          find /usr/bin/aarch64-linux-gnu-* | sed 's+/usr/bin/aarch64-linux-gnu-++g' | xargs -n1 -I{} ln -s /usr/bin/aarch64-linux-gnu-{} {}
-          ln -s ../build/gcc-bootstrap/gcc/xgcc arm-mingw32ce-gcc # dirty workaround to fix "command not found"
-          export PATH=$(pwd):$PATH
-          cd ..
-          rm -rf build
-          mkdir build
-          cd build
-          ../build.sh -j4 --host=aarch64-linux-gnu
-          cd /opt/cegcc
-          find . | xargs file | grep "not stripped" | grep -oE '^[^:]+' | xargs /usr/bin/aarch64-linux-gnu-strip
-          cd /opt
-          zip -r $DIR/cegcc-aarch64.zip cegcc
-      - name: Generate archive name
-        id: archive_name
-        run: |
-          echo ::set-output name=name_x86_64::cegcc-x86_64-${GITHUB_REF/refs\/*s\//}
-          echo ::set-output name=name_aarch64::cegcc-aarch64-${GITHUB_REF/refs\/*s\//}
-      - name: Upload cegcc-x86_64.zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          zip -r "$GITHUB_WORKSPACE/cegcc-${{ matrix.arch }}.zip" cegcc
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
         with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: cegcc-x86_64.zip
-          asset_name: ${{ steps.archive_name.outputs.name_x86_64 }}.zip
-          asset_content_type: application/zip
-      - name: Upload cegcc-aarch64.zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          name: cegcc-${{ matrix.arch }}
+          path: cegcc-${{ matrix.arch }}.zip
+
+  release:
+    name: Create release
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+      - name: Generate release name
+        id: release_name
+        run: echo "name=${GITHUB_REF#refs/*/}" >> "$GITHUB_OUTPUT"
+      - name: Rename artifacts
+        run: |
+          TAG="${GITHUB_REF#refs/*/}"
+          mv cegcc-x86_64/cegcc-x86_64.zip "cegcc-x86_64-${TAG}.zip"
+          mv cegcc-aarch64/cegcc-aarch64.zip "cegcc-aarch64-${TAG}.zip"
+      - name: Create release and upload assets
+        uses: softprops/action-gh-release@v2
         with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: cegcc-aarch64.zip
-          asset_name: ${{ steps.archive_name.outputs.name_aarch64 }}.zip
-          asset_content_type: application/zip
+          name: ${{ steps.release_name.outputs.name }}
+          prerelease: true
+          files: |
+            cegcc-x86_64-${{ steps.release_name.outputs.name }}.zip
+            cegcc-aarch64-${{ steps.release_name.outputs.name }}.zip