diff --git a/.cicd/platforms/asan.Dockerfile b/.cicd/platforms/asan.Dockerfile
index d8d4c47864..2471699483 100644
--- a/.cicd/platforms/asan.Dockerfile
+++ b/.cicd/platforms/asan.Dockerfile
@@ -17,21 +17,24 @@ RUN apt-get update && apt-get upgrade -y && \
                        file                 \
                        wget                 \
                        zlib1g-dev           \
-                       zstd
+                       zstd                 \
+                       ;
 
-RUN yes | bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm.sh 20
+ARG _LLVM_VERSION=21
+
+RUN yes | bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm.sh ${_LLVM_VERSION}
 
 #make sure no confusion on what llvm library spring's cmake should pick up on
-RUN rm -rf /usr/lib/llvm-20/lib/cmake
+RUN rm -rf /usr/lib/llvm-${_LLVM_VERSION}/lib/cmake
 
 ENV SPRING_PLATFORM_HAS_EXTRAS_CMAKE=1
 COPY <<-EOF /extras.cmake
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
+	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
 
-  set(CMAKE_C_COMPILER "clang-20" CACHE STRING "")
-  set(CMAKE_CXX_COMPILER "clang++-20" CACHE STRING "")
-  set(CMAKE_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")
-  set(CMAKE_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")
+	set(CMAKE_C_COMPILER "clang-${_LLVM_VERSION}" CACHE STRING "")
+	set(CMAKE_CXX_COMPILER "clang++-${_LLVM_VERSION}" CACHE STRING "")
+	set(CMAKE_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")
+	set(CMAKE_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")
 EOF
 
 ENV ASAN_OPTIONS=detect_leaks=0
diff --git a/.cicd/platforms/ubsan.Dockerfile b/.cicd/platforms/ubsan.Dockerfile
index 84fddbd14c..27ec24767a 100644
--- a/.cicd/platforms/ubsan.Dockerfile
+++ b/.cicd/platforms/ubsan.Dockerfile
@@ -17,26 +17,29 @@ RUN apt-get update && apt-get upgrade -y && \
                        file                 \
                        wget                 \
                        zlib1g-dev           \
-                       zstd
+                       zstd                 \
+                       ;
 
-RUN yes | bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm.sh 20
+ARG _LLVM_VERSION=21
+
+RUN yes | bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm.sh ${_LLVM_VERSION}
 
 #make sure no confusion on what llvm library spring's cmake should pick up on
-RUN rm -rf /usr/lib/llvm-20/lib/cmake
+RUN rm -rf /usr/lib/llvm-${_LLVM_VERSION}/lib/cmake
 
 COPY <<-EOF /ubsan.supp
-  vptr:wasm_eosio_validation.hpp
-  vptr:wasm_eosio_injection.hpp
+	vptr:wasm_eosio_validation.hpp
+	vptr:wasm_eosio_injection.hpp
 EOF
 
 ENV SPRING_PLATFORM_HAS_EXTRAS_CMAKE=1
 COPY <<-EOF /extras.cmake
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
+	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)
 
-  set(CMAKE_C_COMPILER "clang-20" CACHE STRING "")
-  set(CMAKE_CXX_COMPILER "clang++-20" CACHE STRING "")
-  set(CMAKE_C_FLAGS "-fsanitize=undefined -fno-sanitize-recover=all -fno-omit-frame-pointer" CACHE STRING "")
-  set(CMAKE_CXX_FLAGS "-fsanitize=undefined -fno-sanitize-recover=all -fno-omit-frame-pointer" CACHE STRING "")
+	set(CMAKE_C_COMPILER "clang-${_LLVM_VERSION}" CACHE STRING "")
+	set(CMAKE_CXX_COMPILER "clang++-${_LLVM_VERSION}" CACHE STRING "")
+	set(CMAKE_C_FLAGS "-fsanitize=undefined -fno-sanitize-recover=all -fno-omit-frame-pointer" CACHE STRING "")
+	set(CMAKE_CXX_FLAGS "-fsanitize=undefined -fno-sanitize-recover=all -fno-omit-frame-pointer" CACHE STRING "")
 EOF
 
 ENV UBSAN_OPTIONS=print_stacktrace=1,suppressions=/ubsan.supp