diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bc51b47..986d4af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -137,7 +137,7 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32-sse41-popcnt",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-x86",
             }
           # Linux x86_64 images
           - {
@@ -152,14 +152,14 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               openssl: "yes",
-              openssl_arg: "linux-x86_64",
+              openssl_arg: "linux-generic64",
             }
           - {
               image: "linux-x64-clang",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=clang",
               openssl: "yes",
-              openssl_arg: "linux-x86_64",
+              openssl_arg: "linux-x86-clang",
             }
           - {
               image: "linux-x86_64-full",
@@ -174,14 +174,14 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-generic32",
             }
           - {
               image: "linux-riscv64",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-generic64",
             }
           # Linux s390x images
           - {
@@ -189,7 +189,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux64-s390x",
             }
           # Linux mips images
           - {
@@ -197,7 +197,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux64-mips64",
             }
           # Linux ppc64le images
           - {
@@ -205,7 +205,7 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=ppc-64",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-ppc64le",
             }
           # Linux m68k images
           - {
@@ -213,7 +213,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-generic32",
             }
           # Linux xtensa images
           - {
@@ -221,7 +221,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-generic64",
             }
           # Windows x86_x64 images
           - {
@@ -229,28 +229,28 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw64",
             }
           - {
               image: "windows-static-x64-posix",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw64",
             }
           - {
               image: "windows-shared-x64",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw64",
             }
           - {
               image: "windows-shared-x64-posix",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw64",
             }
           # Windows x86 images
           - {
@@ -260,21 +260,27 @@ jobs:
               openssl: "yes",
               openssl_arg: "",
             }
-          - { image: "windows-shared-x86", stockfish: "no", stockfish_arg: "" }
+          - {
+              image: "windows-shared-x86", 
+              stockfish: "no", 
+              stockfish_arg: "",
+              openssl: "yes",
+              openssl_arg: "mingw",
+          }
           # Windows arm images
           - {
               image: "windows-armv7",
               stockfish: "no",
               stockfish_arg: "ARCH=armv7-neon COMP=clang",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw",
             }
           - {
               image: "windows-arm64",
               stockfish: "no",
               stockfish_arg: "ARCH=armv8 COMP=clang",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw64",
             }
           # manylinux2014 images
           - {
@@ -282,7 +288,7 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32-sse41-popcnt",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-x86",
             }
           - {
               image: "manylinux2014-x64",
@@ -296,7 +302,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-aarch64",
             }
           # web-wasm images
           - {
@@ -304,7 +310,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
             }
     steps:
       - uses: actions/checkout@v2