diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 6cecdb10..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-task:
-  matrix:
-    - name: FreeBSD
-      freebsd_instance:
-        image_family: freebsd-13-1
-      env:
-        matrix:
-        - JULIA_VERSION: 1.6
-        - JULIA_VERSION: 1
-        # - JULIA_VERSION: nightly # not available
-    - name: Linux ARMv8
-      arm_container:
-        image: ubuntu:latest
-      env:
-        matrix:
-        - JULIA_VERSION: 1.6
-        - JULIA_VERSION: 1
-        - JULIA_VERSION: nightly
-    # - name: musl Linux # skip because of https://github.com/JuliaLang/julia/issues/40556
-    #   container:
-    #     image: alpine:3.14
-    #   env:
-    #     matrix:
-    #     - JULIA_VERSION: 1.6
-    #     - JULIA_VERSION: 1
-    #     - JULIA_VERSION: nightly
-    - name: MacOS M1
-      macos_instance:
-        image: ghcr.io/cirruslabs/macos-monterey-base:latest
-      env:
-        matrix:
-        # - JULIA_VERSION: 1.6 # not available
-        - JULIA_VERSION: 1
-        - JULIA_VERSION: nightly
-
-  allow_failures: $JULIA_VERSION == 'nightly'
-  install_script: |
-    URL="https://raw.githubusercontent.com/ararslan/CirrusCI.jl/master/bin/install.sh"
-    set -x
-    if [ "$(uname -s)" = "Linux" ] && command -v apt; then
-        apt update
-        apt install -y curl
-    fi
-    if command -v curl; then
-        sh -c "$(curl ${URL})"
-    elif command -v wget; then
-        sh -c "$(wget ${URL} -O-)"
-    elif command -v fetch; then
-        sh -c "$(fetch ${URL} -o -)"
-    else
-        echo "No downloader installed! :( Install one! :)"
-    fi
-  build_script:
-    - cirrusjl build
-  test_script:
-    - cirrusjl test
-  coverage_script:
-    - cirrusjl coverage codecov
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ad4b3162..e2835238 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -17,12 +17,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        julia-arch: [x64, x86]
-        julia-version: ['1.6','1','1.10-nightly','nightly']
+        os:
+          - ubuntu-latest
+          - macOS-13 # intel
+          - macOS-14 # arm
+          - windows-latest
+        julia-arch:
+          - 'x64'
+          - 'x86'
+          - 'aarch64'
+        julia-version:
+          - '1.6'
+          - '1'
+          - 'nightly'
         exclude:
-          - os: macOS-latest
+          - os: ubuntu-latest
+            julia-arch: aarch64
+          - os: windows-latest
+            julia-arch: aarch64
+          - os: macOS-13
             julia-arch: x86
+          - os: macOS-13
+            julia-arch: aarch64
+          - os: macOS-14
+            julia-arch: x86
+          - os: macOS-14
+            julia-arch: x64
+          - os: macOS-14
+            julia-version: '1.6'
 
     steps:
       - uses: actions/checkout@v4