diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1498086a..afa425ef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
     machine:
       image: ubuntu-2204:2024.11.1
     docker:
-      - image: helics/buildenv:sanitizers-19
+      - image: helics/buildenv:sanitizers-14
     environment:
       CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=thread -nostdinc++ -nostdlib++ -L/root/develop/libcxx_tsan/lib -lc++ -lc++abi -I/root/develop/libcxx_tsan/include -I/root/develop/libcxx_tsan/include/c++/v1 -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O2 -Wl,-rpath,/root/develop/libcxx_tsan/lib"  '
       TSAN_OPTIONS: "second_deadlock_stack=1"
@@ -69,7 +69,7 @@ jobs:
     machine:
       image: ubuntu-2204:2024.11.1
     docker:
-      - image: helics/buildenv:sanitizers-19
+      - image: helics/buildenv:sanitizers-14
     environment:
       CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=memory -nostdinc++ -nostdlib++ -L/root/develop/libcxx_msan/lib -lc++ -lc++abi -I/root/develop/libcxx_msan/include -I/root/develop/libcxx_msan/include/c++/v1 -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O1 -Wl,-rpath,/root/develop/libcxx_msan/lib" '
 
diff --git a/config/AddGoogletest.cmake b/config/AddGoogletest.cmake
index d64595c2..9c66063f 100644
--- a/config/AddGoogletest.cmake
+++ b/config/AddGoogletest.cmake
@@ -41,10 +41,10 @@ add_subdirectory(
 )
 
 if(NOT MSVC)
-    target_compile_options(gtest PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions")
-    target_compile_options(gmock PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions") 
-    target_compile_options(gtest_main PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions")
-    target_compile_options(gmock_main PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions")
+    target_compile_options(gtest PUBLIC "-Wno-undef" "-Wno-c++17-attribute-extensions")
+    target_compile_options(gmock PUBLIC "-Wno-undef" "-Wno-c++17-attribute-extensions") 
+    target_compile_options(gtest_main PUBLIC "-Wno-undef" "-Wno-c++17-attribute-extensions")
+    target_compile_options(gmock_main PUBLIC "-Wno-undef" "-Wno-c++17-attribute-extensions")
 endif()
 
 if(GOOGLE_TEST_INDIVIDUAL)