diff --git a/ci_build_images/msan.Dockerfile b/ci_build_images/msan.Dockerfile
index f6a4b9ce..c06adf2f 100644
--- a/ci_build_images/msan.Dockerfile
+++ b/ci_build_images/msan.Dockerfile
@@ -14,7 +14,7 @@ ENV PATH=$MSAN_LIBDIR/bin:$PATH
 
 # hadolint ignore=SC2046
 RUN . /etc/os-release \
-    if [ "${CLANG_VERSION}" -gt 17 ]; then \
+    && if [ "${CLANG_VERSION}" -gt 17 ]; then \
         export LLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind"; \
     else \
         export LLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"; fi \
diff --git a/ci_build_images/test.Dockerfile b/ci_build_images/test.Dockerfile
index 18bcb0ec..b1643921 100644
--- a/ci_build_images/test.Dockerfile
+++ b/ci_build_images/test.Dockerfile
@@ -111,9 +111,9 @@ ENV MSAN_LIBDIR=/msan-libs
 ENV MSAN_SYMBOLIZER_PATH=/msan-libs/bin/llvm-symbolizer-msan
 
 RUN if [ "${CLANG_VERSION}" -gt 17 ]; then \
-    export LLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind"; \
+    export LLVM_ENABLE_RUNTIMES='"libcxx;libcxxabi;libunwind"''; \
     else \
-    export LLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"; \
+    export LLVM_ENABLE_RUNTIMES='"libcxx;libcxxabi"''; \
     fi \
     && echo "LLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" >> /etc/environment
 
@@ -151,7 +151,7 @@ RUN . /etc/environment \
         -DCMAKE_C_COMPILER=clang-${CLANG_VERSION} \
         -DCMAKE_CXX_COMPILER=clang++-${CLANG_VERSION} \
         -DLLVM_ENABLE_RUNTIMES="${LLVM_ENABLE_RUNTIMES}" \
-        $(if [ "${CLANG_VERSION}" = 19 ]; then echo '-DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_ENABLE_SPHINX=OFF'; fi) \
+        $(if [ "${CLANG_VERSION}" = 19 ]; then echo "-DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_ENABLE_SPHINX=OFF"; fi) \
         -DLLVM_USE_SANITIZER=MemoryWithOrigins \
     && make -C build -j "$(nproc)" \
     && cp -aL build/lib/libc++.so* $MSAN_LIBDIR \