diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index 626e7cf..d69a2e8 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -38,6 +38,8 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{ contains(inputs.packages_repository, 'MINGW') && 'MINGW64' || 'MSYS' }}
+          update: true
+          cache: true
 
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/mingw-cross-toolchain.yml b/.github/workflows/mingw-cross-toolchain.yml
index 38df232..39a85e0 100644
--- a/.github/workflows/mingw-cross-toolchain.yml
+++ b/.github/workflows/mingw-cross-toolchain.yml
@@ -19,47 +19,52 @@ 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]
+  mingw-w64-cross-mingwarm64-gcc-stage1:
+    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
+      package_name: mingw-w64-cross-mingwarm64-gcc-stage1
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
       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]
+  mingw-w64-cross-mingwarm64-windows-default-manifest:
+    needs: [
+      mingw-w64-cross-mingwarm64-binutils,
+      mingw-w64-cross-mingwarm64-gcc-stage1
+    ]
     uses: ./.github/workflows/build-package.yml
     with:
-      package_name: mingw-w64-cross-windows-default-manifest
+      package_name: mingw-w64-cross-mingwarm64-windows-default-manifest
       needs: ${{ toJson(needs) }}
       packages_repository: Windows-on-ARM-Experiments/MSYS2-packages
       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-mingwarm64-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-mingwarm64-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-mingwarm64-gcc-stage1,
+      mingw-w64-cross-mingwarm64-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,9 +105,9 @@ jobs:
 
   mingw-w64-cross-zlib:
     needs: [
-      mingw-w64-cross-headers,
-      mingw-w64-cross-binutils,
-      mingw-w64-cross-windows-default-manifest,
+      mingw-w64-cross-mingwarm64-headers,
+      mingw-w64-cross-mingwarm64-binutils,
+      mingw-w64-cross-mingwarm64-windows-default-manifest,
       mingw-w64-cross-crt,
       mingw-w64-cross-winpthreads,
       mingw-w64-cross-gcc
diff --git a/build.sh b/build.sh
index 055c908..641c154 100644
--- a/build.sh
+++ b/build.sh
@@ -13,33 +13,33 @@ fi
 pacman -R --noconfirm mingw-w64-cross-gcc || true
 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-windows-default-manifest || true
+pacman -R --noconfirm mingw-w64-cross-mingwarm64-gcc-stage1 || 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::"
 
-echo "::group::Build mingw-w64-cross-gcc-stage1"
-  pushd ../MSYS2-packages/mingw-w64-cross-gcc-stage1
+echo "::group::Build mingw-w64-cross-mingwarm64-gcc-stage1"
+  pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-gcc-stage1
     makepkg $MAKEPKG_OPTIONS
   popd
 echo "::endgroup::"
 
-echo "::group::Build mingw-w64-cross-windows-default-manifest"
-  pushd ../MSYS2-packages/mingw-w64-cross-windows-default-manifest
+echo "::group::Build mingw-w64-cross-mingwarm64-windows-default-manifest"
+  pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-windows-default-manifest
     makepkg $MAKEPKG_OPTIONS
   popd
 echo "::endgroup::"