diff --git a/src/scripts/setup-dkml.sh b/src/scripts/setup-dkml.sh
index 6ad85a5..97dfc4a 100755
--- a/src/scripts/setup-dkml.sh
+++ b/src/scripts/setup-dkml.sh
@@ -540,7 +540,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env
 
diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml
index 3017e39..8021f89 100644
--- a/test/gh-darwin/pre/action.yml
+++ b/test/gh-darwin/pre/action.yml
@@ -899,7 +899,7 @@ runs:
                 cat >.ci/sd4/run-with-env <<EOF
         #!/bin/sh
         set -euf
-        exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+        exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
         EOF
                 chmod +x .ci/sd4/run-with-env
 
@@ -1805,7 +1805,7 @@ runs:
       shell: bash
       run: |
         set -x
-        echo '16f924-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
+        echo 'ba41bf-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
         echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
         echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
 
diff --git a/test/gh-linux/pre/action.yml b/test/gh-linux/pre/action.yml
index 8aae0e1..5b2a903 100644
--- a/test/gh-linux/pre/action.yml
+++ b/test/gh-linux/pre/action.yml
@@ -924,7 +924,7 @@ runs:
                 cat >.ci/sd4/run-with-env <<EOF
         #!/bin/sh
         set -euf
-        exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+        exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
         EOF
                 chmod +x .ci/sd4/run-with-env
 
@@ -1830,7 +1830,7 @@ runs:
       shell: bash
       run: |
         set -x
-        echo '16f924-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
+        echo 'ba41bf-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
         echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
         echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
 
diff --git a/test/gh-windows/pre/action.yml b/test/gh-windows/pre/action.yml
index 66b4fb9..30a8566 100644
--- a/test/gh-windows/pre/action.yml
+++ b/test/gh-windows/pre/action.yml
@@ -960,7 +960,7 @@ runs:
                 cat >.ci/sd4/run-with-env <<EOF
         #!/bin/sh
         set -euf
-        exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+        exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
         EOF
                 chmod +x .ci/sd4/run-with-env
 
@@ -2004,7 +2004,7 @@ runs:
       shell: bash
       run: |
         set -x
-        echo '16f924-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
+        echo 'ba41bf-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
         echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
         echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
 
diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml
index 3668d0b..e3fdca3 100644
--- a/test/gl/setup-dkml.gitlab-ci.yml
+++ b/test/gl/setup-dkml.gitlab-ci.yml
@@ -1211,7 +1211,7 @@ variables:
               cat >.ci/sd4/run-with-env <<EOF
       #!/bin/sh
       set -euf
-      exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+      exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
       EOF
               chmod +x .ci/sd4/run-with-env
 
@@ -3240,7 +3240,7 @@ variables:
               cat >.ci/sd4/run-with-env <<EOF
       #!/bin/sh
       set -euf
-      exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+      exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
       EOF
               chmod +x .ci/sd4/run-with-env
 
@@ -4987,7 +4987,7 @@ variables:
               cat >.ci/sd4/run-with-env <<EOF
       #!/bin/sh
       set -euf
-      exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+      exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
       EOF
               chmod +x .ci/sd4/run-with-env
 
diff --git a/test/pc/setup-dkml-darwin_arm64.sh b/test/pc/setup-dkml-darwin_arm64.sh
index c9aeef1..3f48aed 100644
--- a/test/pc/setup-dkml-darwin_arm64.sh
+++ b/test/pc/setup-dkml-darwin_arm64.sh
@@ -1697,7 +1697,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env
 
diff --git a/test/pc/setup-dkml-darwin_x86_64.sh b/test/pc/setup-dkml-darwin_x86_64.sh
index 49812ca..fad85d2 100644
--- a/test/pc/setup-dkml-darwin_x86_64.sh
+++ b/test/pc/setup-dkml-darwin_x86_64.sh
@@ -1699,7 +1699,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env
 
diff --git a/test/pc/setup-dkml-linux_x86.sh b/test/pc/setup-dkml-linux_x86.sh
index 1836a4d..43b5867 100644
--- a/test/pc/setup-dkml-linux_x86.sh
+++ b/test/pc/setup-dkml-linux_x86.sh
@@ -1703,7 +1703,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env
 
diff --git a/test/pc/setup-dkml-linux_x86_64.sh b/test/pc/setup-dkml-linux_x86_64.sh
index df16a54..fc26933 100644
--- a/test/pc/setup-dkml-linux_x86_64.sh
+++ b/test/pc/setup-dkml-linux_x86_64.sh
@@ -1703,7 +1703,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env
 
diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1
index 69f3e99..80c5506 100644
--- a/test/pc/setup-dkml-windows_x86.ps1
+++ b/test/pc/setup-dkml-windows_x86.ps1
@@ -1976,7 +1976,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env
 
diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1
index 7ad20d6..418f87d 100644
--- a/test/pc/setup-dkml-windows_x86_64.ps1
+++ b/test/pc/setup-dkml-windows_x86_64.ps1
@@ -1975,7 +1975,7 @@ EOF
         cat >.ci/sd4/run-with-env <<EOF
 #!/bin/sh
 set -euf
-exec ${docker_runner:-docker run --rm --workdir /work} -v '\$PWD:/work' '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
+exec ${docker_runner:-docker run --rm --workdir /work} -v "\$PWD:/work" '$docker_image_id' /work/.ci/sd4/run-in-docker "\$@"
 EOF
         chmod +x .ci/sd4/run-with-env