diff --git a/.github/scripts/main/solvers.sh b/.github/scripts/main/solvers.sh
index 771aafe3f01..a2adae7f339 100644
--- a/.github/scripts/main/solvers.sh
+++ b/.github/scripts/main/solvers.sh
@@ -13,7 +13,7 @@ echo "$OPAMROOT"
 
 case "$SOLVER" in
   z3)
-    PKGS=$SOLVER
+    PKGS=("$SOLVER")
     if [[ $RUNNER_OS = 'macOS' ]]; then
       # brew may require extra flags to override the system-installed python,
       # so we assume the presence of python3 on the macOS runners.
@@ -21,7 +21,7 @@ case "$SOLVER" in
     fi
     ;;
   0install)
-    PKGS="$SOLVER opam-0install-cudf"
+    PKGS=("$SOLVER" opam-0install-cudf)
     ;;
   *)
     echo -e "\e[31mSolver $SOLVER not handled\e[0m";
@@ -32,7 +32,7 @@ esac
 opam update --depexts
 opam switch create "$SOLVER" ocaml-system || true
 opam upgrade --all
-opam install "$PKGS"
+opam install "${PKGS[@]}"
 opam install . --deps
 opam clean --logs --switch-cleanup
 eval $(opam env)
diff --git a/shell/bootstrap-ocaml.sh b/shell/bootstrap-ocaml.sh
index d0c158c0964..b01acac9910 100755
--- a/shell/bootstrap-ocaml.sh
+++ b/shell/bootstrap-ocaml.sh
@@ -143,7 +143,7 @@ if [ -n "$1" ] && [ -n "${COMSPEC}" ] && [ -x "${COMSPEC}" ] ; then
       ./configure --prefix "$WINPREFIX" \
                   --build="$BUILD" --host=$HOST \
                   --disable-stdlib-manpages \
-                  "$BOOTSTRAP_EXTRA_OPTS"
+                  $BOOTSTRAP_EXTRA_OPTS
     for target in $BOOTSTRAP_TARGETS; do
       PATH="${PATH_PREPEND}${PREFIX}/bin:${PATH}" Lib="${LIB_PREPEND}${Lib}" Include="${INC_PREPEND}${Include}" make -j "$target"
     done
@@ -153,7 +153,7 @@ if [ -n "$1" ] && [ -n "${COMSPEC}" ] && [ -x "${COMSPEC}" ] ; then
 else
   PREFIX=$(cd .. ; pwd)/ocaml
   if [ "${GEN_CONFIG_ONLY}" -eq 0 ] ; then
-    ./configure --prefix "${PREFIX}" "$BOOTSTRAP_EXTRA_OPTS" --disable-stdlib-manpages
+    ./configure --prefix "${PREFIX}" $BOOTSTRAP_EXTRA_OPTS --disable-stdlib-manpages
     for target in $BOOTSTRAP_TARGETS; do
       ${MAKE:-make} -j "$target"
     done