diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67a9524ad..aba278ee7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -110,7 +110,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [win64,linux64,linuxarm64]
+        target: [win64,winarm64,linux64,linuxarm64]
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 82e7438fa..43e91739e 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -34,7 +34,7 @@ ffbuild_dockerbuild() {
     unset PKG_CONFIG_LIBDIR
 
     if [[ -z "$COMPILER_SYSROOT" ]]; then
-        COMPILER_SYSROOT="$(${CC} -print-sysroot)/usr"
+        COMPILER_SYSROOT="$(${CC} -print-sysroot)/usr/${FFBUILD_TOOLCHAIN}"
     fi
 
     local myconf=(