diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3975f8d..c62e0bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,38 +72,38 @@ jobs:
         # Linux x86_64 images
           - { image: "linux-x64", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern" }
           - { image: "linux-x64-tinycc", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern" }
-          - { image: "linux-x64-clang", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern" }
+          - { image: "linux-x64-clang", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern COMP=clang" }
           - { image: "linux-x86_64-full", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern" }
         # Linux riscv images
-          - { image: "linux-riscv32", stockfish: "yes", stockfish_arg: "ARCH=general-32" }
-          - { image: "linux-riscv64", stockfish: "yes", stockfish_arg: "ARCH=general-64" }
+          - { image: "linux-riscv32", stockfish: "no", stockfish_arg: "" }
+          - { image: "linux-riscv64", stockfish: "no", stockfish_arg: "" }
         # Linux s390x images
-          - { image: "linux-s390x", stockfish: "yes", stockfish_arg: "ARCH=general-64" }
+          - { image: "linux-s390x", stockfish: "no", stockfish_arg: "" }
         # Linux mips images
-          - { image: "linux-mips", stockfish: "yes", stockfish_arg: "ARCH=general-32" }
+          - { image: "linux-mips", stockfish: "no", stockfish_arg: "" }
         # Linux ppc64le images
           - { image: "linux-ppc64le", stockfish: "yes", stockfish_arg: "ARCH=ppc-64" }
         # Linux m68k images
-          - { image: "linux-m68k-uclibc", stockfish: "yes", stockfish_arg: "ARCH=general-32" }
+          - { image: "linux-m68k-uclibc", stockfish: "no", stockfish_arg: "" }
         # Linux xtensa images
           - { image: "linux-xtensa-uclibc", stockfish: "no", stockfish_arg: "" }
         # Windows x86_x64 images
-          - { image: "windows-static-x64", stockfish: "no", stockfish_arg: "" }
-          - { image: "windows-static-x64-posix", stockfish: "no", stockfish_arg: "" }
-          - { image: "windows-shared-x64", stockfish: "no", stockfish_arg: "" }
-          - { image: "windows-shared-x64-posix", stockfish: "no", stockfish_arg: "" }
+          - { image: "windows-static-x64", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern COMP=mingw" }
+          - { image: "windows-static-x64-posix", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern COMP=mingw" }
+          - { image: "windows-shared-x64", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern COMP=mingw" }
+          - { image: "windows-shared-x64-posix", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern COMP=mingw" }
         # Windows x86 images
-          - { image: "windows-static-x86", stockfish: "no", stockfish_arg: "" }
-          - { image: "windows-shared-x86", stockfish: "no", stockfish_arg: "" }
+          - { image: "windows-static-x86", stockfish: "yes", stockfish_arg: "ARCH=x86-32-sse41-popcnt COMP=mingw" }
+          - { image: "windows-shared-x86", stockfish: "yes", stockfish_arg: "ARCH=x86-32-sse41-popcnt COMP=mingw" }
         # Windows arm images
-          - { image: "windows-armv7", stockfish: "no", stockfish_arg: "" }
-          - { image: "windows-arm64", stockfish: "no", stockfish_arg: "" }
+          - { image: "windows-armv7", stockfish: "yes", stockfish_arg: "ARCH=armv7-neon COMP=mingw" }
+          - { image: "windows-arm64", stockfish: "yes", stockfish_arg: "ARCH=armv8 COMP=mingw" }
         # manylinux2014 images
           - { image: "manylinux2014-x86", stockfish: "yes", stockfish_arg: "ARCH=x86-32-sse41-popcnt" }
           - { image: "manylinux2014-x64", stockfish: "yes", stockfish_arg: "ARCH=x86-64-modern" }
           - { image: "manylinux2014-aarch64", stockfish: "yes", stockfish_arg: "ARCH=armv8" }
         # web-wasm images
-          - { image: "web-wasm", stockfish: "no", stockfish_arg: "" }
+          - { image: "web-wasm", stockfish: "yes", stockfish_arg: "ARCH=general-64" }
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2