diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 986d4af..fcac5f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -152,14 +152,14 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               openssl: "yes",
-              openssl_arg: "linux-generic64",
+              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
             }
           - {
               image: "linux-x64-clang",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=clang",
               openssl: "yes",
-              openssl_arg: "linux-x86-clang",
+              openssl_arg: "linux-x86_64-clang",
             }
           - {
               image: "linux-x86_64-full",
@@ -197,7 +197,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "linux64-mips64",
+              openssl_arg: "linux-generic32",
             }
           # Linux ppc64le images
           - {
@@ -213,7 +213,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "linux-generic32",
+              openssl_arg: "linux-generic32 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
             }
           # Linux xtensa images
           - {
@@ -221,7 +221,7 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "linux-generic64",
+              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
             }
           # Windows x86_x64 images
           - {
@@ -229,28 +229,28 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
               openssl: "yes",
-              openssl_arg: "mingw64",
+              openssl_arg: "mingw64 no-asm",
             }
           - {
               image: "windows-static-x64-posix",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
               openssl: "yes",
-              openssl_arg: "mingw64",
+              openssl_arg: "mingw64 no-asm",
             }
           - {
               image: "windows-shared-x64",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "mingw64",
+              openssl_arg: "mingw64 no-asm",
             }
           - {
               image: "windows-shared-x64-posix",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "mingw64",
+              openssl_arg: "mingw64 no-asm",
             }
           # Windows x86 images
           - {
@@ -258,14 +258,14 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32-sse41-popcnt COMP=mingw",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "mingw no-asm",
             }
           - {
               image: "windows-shared-x86", 
               stockfish: "no", 
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "mingw",
+              openssl_arg: "mingw no-asm",
           }
           # Windows arm images
           - {
@@ -273,14 +273,14 @@ jobs:
               stockfish: "no",
               stockfish_arg: "ARCH=armv7-neon COMP=clang",
               openssl: "yes",
-              openssl_arg: "mingw",
+              openssl_arg: "mingw no-asm",
             }
           - {
               image: "windows-arm64",
               stockfish: "no",
               stockfish_arg: "ARCH=armv8 COMP=clang",
               openssl: "yes",
-              openssl_arg: "mingw64",
+              openssl_arg: "mingw64 no-asm",
             }
           # manylinux2014 images
           - {
diff --git a/tools/dockcross-cmake-builder.sh b/tools/dockcross-cmake-builder.sh
index 7b9e5f3..ef113a7 100755
--- a/tools/dockcross-cmake-builder.sh
+++ b/tools/dockcross-cmake-builder.sh
@@ -5,7 +5,7 @@ if (( $# >= 1 )); then
     build_file=build-${image%:*}
     shift 1
 
-    cmake_arg=$*
+    cmake_arg=$@
     echo "cmake arg: $cmake_arg"
 
     #echo "Pulling dockcross/$image"
@@ -16,7 +16,7 @@ if (( $# >= 1 )); then
     chmod +x ./dockcross-"$image"
 
     echo "Build $build_file"
-    ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
+    ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja "$cmake_arg"
     ./dockcross-"$image" ninja -C "$build_file"
 else
     echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
diff --git a/tools/dockcross-command.sh b/tools/dockcross-command.sh
index 12859a4..df03151 100755
--- a/tools/dockcross-command.sh
+++ b/tools/dockcross-command.sh
@@ -4,7 +4,7 @@ if (( $# >= 2 )); then
     image=$1
     shift 1
 
-    command=$*
+    command=$@
     echo "command: $command"
 
     #echo "Pulling dockcross/$image"
@@ -15,7 +15,7 @@ if (( $# >= 2 )); then
     chmod +x ./dockcross-"$image"
     
     echo "Run command in dockcross-$image"
-    ./dockcross-"$image" $command
+    ./dockcross-"$image" "$command"
 else
     echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <command>"
     exit 1
diff --git a/tools/dockcross-make-builder.sh b/tools/dockcross-make-builder.sh
index 1bd2171..6cdc552 100755
--- a/tools/dockcross-make-builder.sh
+++ b/tools/dockcross-make-builder.sh
@@ -5,7 +5,7 @@ if (( $# >= 1 )); then
     build_file=build-${image%:*}
     shift 1
 
-    make_arg=$*
+    make_arg=$@
     echo "make arg: $make_arg"
 
     #echo "Pulling dockcross/$image"
@@ -16,7 +16,7 @@ if (( $# >= 1 )); then
     chmod +x ./dockcross-"$image"
 
     echo "Build $build_file"
-    ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} ' $make_arg
+    ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} ' "$make_arg"
 else
     echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
     exit 1