diff --git a/.github/workflows/mingw-cross-toolchain.yml b/.github/workflows/mingw-cross-toolchain.yml
index 38df232..d6280a7 100644
--- a/.github/workflows/mingw-cross-toolchain.yml
+++ b/.github/workflows/mingw-cross-toolchain.yml
@@ -19,24 +19,27 @@ on:
         value: ${{ toJson(jobs) }}
 
 jobs:
-  mingw-w64-cross-headers:
+  mingw-w64-cross-mingwarm64-headers:
     uses: ./.github/workflows/build-package.yml
     with:
-      package_name: mingw-w64-cross-headers
+      package_name: mingw-w64-cross-mingwarm64-headers
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
       packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
 
-  mingw-w64-cross-binutils:
-    needs: mingw-w64-cross-headers
+  mingw-w64-cross-mingwarm64-binutils:
+    needs: mingw-w64-cross-mingwarm64-headers
     uses: ./.github/workflows/build-package.yml
     with:
-      package_name: mingw-w64-cross-binutils
+      package_name: mingw-w64-cross-mingwarm64-binutils
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
       packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-gcc-stage1:
-    needs: [mingw-w64-cross-headers, mingw-w64-cross-binutils]
+    needs: [
+      mingw-w64-cross-mingwarm64-headers,
+      mingw-w64-cross-mingwarm64-binutils
+    ]
     uses: ./.github/workflows/build-package.yml
     with:
       package_name: mingw-w64-cross-gcc-stage1
@@ -45,7 +48,10 @@ jobs:
       packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-windows-default-manifest:
-    needs: [mingw-w64-cross-binutils, mingw-w64-cross-gcc-stage1]
+    needs: [
+      mingw-w64-cross-mingwarm64-binutils,
+      mingw-w64-cross-gcc-stage1
+    ]
     uses: ./.github/workflows/build-package.yml
     with:
       package_name: mingw-w64-cross-windows-default-manifest
@@ -54,12 +60,11 @@ jobs:
       packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-crt:
-    needs:
-      [
-        mingw-w64-cross-headers,
-        mingw-w64-cross-binutils,
-        mingw-w64-cross-gcc-stage1
-      ]
+    needs: [
+      mingw-w64-cross-mingwarm64-headers,
+      mingw-w64-cross-mingwarm64-binutils,
+      mingw-w64-cross-gcc-stage1
+    ]
     uses: ./.github/workflows/build-package.yml
     with:
       package_name: mingw-w64-cross-crt
@@ -69,13 +74,12 @@ jobs:
       packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-winpthreads:
-    needs:
-      [
-        mingw-w64-cross-headers,
-        mingw-w64-cross-binutils,
-        mingw-w64-cross-gcc-stage1,
-        mingw-w64-cross-crt
-      ]
+    needs: [
+      mingw-w64-cross-mingwarm64-headers,
+      mingw-w64-cross-mingwarm64-binutils,
+      mingw-w64-cross-gcc-stage1,
+      mingw-w64-cross-crt
+    ]
     uses: ./.github/workflows/build-package.yml
     with:
       package_name: mingw-w64-cross-winpthreads
@@ -84,15 +88,14 @@ jobs:
       packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }}
 
   mingw-w64-cross-gcc:
-    needs:
-      [
-        mingw-w64-cross-headers,
-        mingw-w64-cross-binutils,
-        mingw-w64-cross-gcc-stage1,
-        mingw-w64-cross-windows-default-manifest,
-        mingw-w64-cross-crt,
-        mingw-w64-cross-winpthreads
-      ]
+    needs: [
+      mingw-w64-cross-mingwarm64-headers,
+      mingw-w64-cross-mingwarm64-binutils,
+      mingw-w64-cross-gcc-stage1,
+      mingw-w64-cross-windows-default-manifest,
+      mingw-w64-cross-crt,
+      mingw-w64-cross-winpthreads
+    ]
     uses: ./.github/workflows/build-package.yml
     with:
       package_name: mingw-w64-cross-gcc
@@ -102,8 +105,8 @@ jobs:
 
   mingw-w64-cross-zlib:
     needs: [
-      mingw-w64-cross-headers,
-      mingw-w64-cross-binutils,
+      mingw-w64-cross-mingwarm64-headers,
+      mingw-w64-cross-mingwarm64-binutils,
       mingw-w64-cross-windows-default-manifest,
       mingw-w64-cross-crt,
       mingw-w64-cross-winpthreads,
diff --git a/build.sh b/build.sh
index 055c908..0625c1f 100644
--- a/build.sh
+++ b/build.sh
@@ -15,19 +15,19 @@ pacman -R --noconfirm mingw-w64-cross-winpthreads || true
 pacman -R --noconfirm mingw-w64-cross-crt || true
 pacman -R --noconfirm mingw-w64-cross-windows-default-manifest || true
 pacman -R --noconfirm mingw-w64-cross-gcc-stage1 || true
-pacman -R --noconfirm mingw-w64-cross-binutils || true
-pacman -R --noconfirm mingw-w64-cross-headers || true
+pacman -R --noconfirm mingw-w64-cross-mingwarm64-binutils || true
+pacman -R --noconfirm mingw-w64-cross-mingwarm64-headers || true
 
 pacman -S --noconfirm base-devel
 
-echo "::group::Build mingw-w64-cross-headers"
-  pushd ../MSYS2-packages/mingw-w64-cross-headers
+echo "::group::Build mingw-w64-cross-mingwarm64-headers"
+  pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-headers
     makepkg $MAKEPKG_OPTIONS
   popd
 echo "::endgroup::"
 
-echo "::group::Build mingw-w64-cross-binutils"
-  pushd ../MSYS2-packages/mingw-w64-cross-binutils
+echo "::group::Build mingw-w64-cross-mingwarm64-binutils"
+  pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-binutils
     makepkg $MAKEPKG_OPTIONS
   popd
 echo "::endgroup::"