diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7b9ef7..1e206c5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,15 +23,29 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-13 # Intel
         target:
           - tool-version: 'latest'
             command: 'makers --version && cargo-make make --version'
+          # They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
+          - tool-version: '0.36.7'
+            command: 'makers --version && cargo-make make --version'
+          # Supporting olderst
           # https://github.com/kachick/asdf-cargo-make/blob/8a7095692e6a880568a5b48c441ea518ef6a61cb/bin/download#L12
           # https://github.com/kachick/asdf-cargo-make/blob/8a7095692e6a880568a5b48c441ea518ef6a61cb/lib/utils.bash#L59-L61
           - tool-version: '0.16.0'
             # makers does not exist
             command: 'cargo-make make --version'
+        include:
+          # They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
+          - os: macos-14 # M1
+            target:
+              tool-version: 'latest'
+              command: 'makers --version && cargo-make make --version'
+          - os: macos-14 # M1
+            target:
+              tool-version: '0.36.7'
+              command: 'makers --version && cargo-make make --version'
     runs-on: ${{ matrix.os }}
     steps:
       - uses: asdf-vm/actions/plugin-test@v3
diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml
index 7a69f78..2b3098a 100644
--- a/.github/workflows/ci-dev.yml
+++ b/.github/workflows/ci-dev.yml
@@ -18,12 +18,20 @@ on:
 jobs:
   tasks:
     timeout-minutes: 10
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          # - macos-14 # M1 # asdf-typos does not support yet https://github.com/aschiavon91/asdf-typos/blob/98babb263fc77a9d9f2aaebb257899c29cb4c5d4/bin/download#L21
+          - macos-13 # Intel
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: asdf-vm/actions/setup@v3
       - run: |
           asdf plugin-add cargo-make https://github.com/kachick/asdf-cargo-make.git
+          asdf plugin update cargo-make ${{ github.ref }} # https://github.com/asdf-vm/asdf/issues/1201
           asdf install cargo-make
           makers help
           makers setup
diff --git a/.github/workflows/mise.yml b/.github/workflows/mise.yml
index d21cf89..1891d1d 100644
--- a/.github/workflows/mise.yml
+++ b/.github/workflows/mise.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-13 # Intel
         target:
           - command: |
               mise install cargo-make@latest
@@ -33,6 +33,20 @@ jobs:
               mise install cargo-make@0.16.0
               # makers does not exist
               mise x cargo-make@0.16.0 -- cargo-make make --version
+        include:
+          # They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
+          - os: macos-14 # M1
+            target:
+              command: |
+                mise install cargo-make@latest
+                mise x cargo-make@latest -- makers --version
+                mise x cargo-make@latest -- cargo-make make --version
+          - os: macos-14 # M1
+            target:
+              command: |
+                mise install cargo-make@0.36.7
+                mise x cargo-make@latest -- makers --version
+                mise x cargo-make@latest -- cargo-make make --version
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
diff --git a/lib/utils.bash b/lib/utils.bash
index 71f9216..6a40c9a 100644
--- a/lib/utils.bash
+++ b/lib/utils.bash
@@ -66,7 +66,8 @@ download_release() {
 
 	case "$(uname -m)" in
 	x86_64*) architecture="x86_64" ;;
-	aarch64 | arm64) fail "Unsupported architecture for now. See https://github.com/sagiegurari/cargo-make/issues/738" ;;
+	# They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
+	aarch64 | arm64) architecture="aarch64" ;;
 	*) fail "Unsupported architecture" ;;
 	esac