diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py
index a0817c59b9..144400fed4 100755
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -209,7 +209,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
         ):
             continue
 
-        # Enable code coverage for Debian Bookworm using GCC 14 in Debug and no
+        # Enable code coverage for Debian Bookworm using GCC 15 in Debug and no
         # Unity on linux/amd64
         if (
             f"{os['compiler_name']}-{os['compiler_version']}" == "gcc-15"
@@ -282,6 +282,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
                     "build_type": build_type,
                     "os": os,
                     "architecture": architecture,
+                    "sanitizers": "",
                 }
             )
 
diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index 1372c5b580..7d0ecdf309 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -116,12 +116,13 @@ jobs:
         env:
           BUILD_TYPE: ${{ inputs.build_type }}
           SANITIZERS: ${{ inputs.sanitizers }}
+          CMAKE_ARGS: ${{ inputs.cmake_args }}
         run: |
           cmake \
             -G '${{ runner.os == 'Windows' && 'Visual Studio 17 2022' || 'Ninja' }}' \
             -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
             -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
-            ${{ inputs.cmake_args }} \
+            ${CMAKE_ARGS} \
             ..
 
       - name: Build the binary
diff --git a/cmake/deps/Boost.cmake b/cmake/deps/Boost.cmake
index f2d430b9ff..62bd30046a 100644
--- a/cmake/deps/Boost.cmake
+++ b/cmake/deps/Boost.cmake
@@ -1,3 +1,5 @@
+include(CompilationEnv)
+
 find_package(Boost 1.82 REQUIRED
   COMPONENTS
     chrono