diff --git a/Source/compositorclient/test/legacy-test/CMakeLists.txt b/Source/compositorclient/test/legacy-test/CMakeLists.txt
index 7ad7b107..e36c0f12 100644
--- a/Source/compositorclient/test/legacy-test/CMakeLists.txt
+++ b/Source/compositorclient/test/legacy-test/CMakeLists.txt
@@ -23,6 +23,10 @@ find_package(${NAMESPACE}LocalTracer CONFIG REQUIRED)
 
 add_executable(compositorclient_test main.cpp)
 
+set_target_properties(compositorclient_test PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(compositorclient_test
     PRIVATE
         ${NAMESPACE}Core::${NAMESPACE}Core
diff --git a/Source/cryptography/implementation/OpenSSL/CMakeLists.txt b/Source/cryptography/implementation/OpenSSL/CMakeLists.txt
index 2bf64cfb..55084529 100644
--- a/Source/cryptography/implementation/OpenSSL/CMakeLists.txt
+++ b/Source/cryptography/implementation/OpenSSL/CMakeLists.txt
@@ -42,6 +42,10 @@ add_library(${TARGET} STATIC
     Random.cpp
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(${TARGET}
     PRIVATE
         ${NAMESPACE}Core::${NAMESPACE}Core
diff --git a/Source/cryptography/implementation/SecApi/CMakeLists.txt b/Source/cryptography/implementation/SecApi/CMakeLists.txt
index f5d56a4f..8cddfe3e 100644
--- a/Source/cryptography/implementation/SecApi/CMakeLists.txt
+++ b/Source/cryptography/implementation/SecApi/CMakeLists.txt
@@ -31,6 +31,10 @@ add_library(${TARGET} STATIC
     Random.cpp
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(${TARGET}
     PUBLIC
         ${NAMESPACE}Core::${NAMESPACE}Core
diff --git a/Source/cryptography/implementation/Thunder/CMakeLists.txt b/Source/cryptography/implementation/Thunder/CMakeLists.txt
index 248dd47a..cb9490ed 100644
--- a/Source/cryptography/implementation/Thunder/CMakeLists.txt
+++ b/Source/cryptography/implementation/Thunder/CMakeLists.txt
@@ -31,6 +31,10 @@ target_link_libraries(${TARGET}
         ${NAMESPACE}Cryptalgo::${NAMESPACE}Cryptalgo
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_include_directories(${TARGET}
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
diff --git a/Source/cryptography/tests/cryptography_test/NetflixVaultGenerator/CMakeLists.txt b/Source/cryptography/tests/cryptography_test/NetflixVaultGenerator/CMakeLists.txt
index ceacbcba..01c51f08 100644
--- a/Source/cryptography/tests/cryptography_test/NetflixVaultGenerator/CMakeLists.txt
+++ b/Source/cryptography/tests/cryptography_test/NetflixVaultGenerator/CMakeLists.txt
@@ -25,6 +25,10 @@ add_executable(NetflixVaultGenerator
    main.cpp
 )
 
+set_target_properties(NetflixVaultGenerator PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(NetflixVaultGenerator
    PRIVATE
    OpenSSL::Crypto
diff --git a/Source/cryptography/tests/rpc_cryptography_test/CMakeLists.txt b/Source/cryptography/tests/rpc_cryptography_test/CMakeLists.txt
index b7380a85..ea82d655 100644
--- a/Source/cryptography/tests/rpc_cryptography_test/CMakeLists.txt
+++ b/Source/cryptography/tests/rpc_cryptography_test/CMakeLists.txt
@@ -24,6 +24,10 @@ set(TARGET rpc_cryptography_test)
 
 add_executable(${TARGET} rpc_cryptography_test.cpp)
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_include_directories(${TARGET}  
     PRIVATE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
diff --git a/Source/graphicsbuffer/example/CMakeLists.txt b/Source/graphicsbuffer/example/CMakeLists.txt
index c96927f7..97f86d39 100644
--- a/Source/graphicsbuffer/example/CMakeLists.txt
+++ b/Source/graphicsbuffer/example/CMakeLists.txt
@@ -24,6 +24,10 @@ find_package(CompileSettingsDebug REQUIRED)
 
 add_executable(graphicsbuffertest main.cpp)
 
+set_target_properties(graphicsbuffertest PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(graphicsbuffertest PRIVATE
     CompileSettingsDebug::CompileSettingsDebug
     ${NAMESPACE}Definitions::${NAMESPACE}Definitions
diff --git a/Tests/ocdmtest/CMakeLists.txt b/Tests/ocdmtest/CMakeLists.txt
index 31ce1023..35bc2b3a 100644
--- a/Tests/ocdmtest/CMakeLists.txt
+++ b/Tests/ocdmtest/CMakeLists.txt
@@ -33,6 +33,11 @@ add_executable(${PROJECT_NAME}
     main.cpp
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
+
 target_link_libraries(${TARGET}
    PRIVATE 
         ${NAMESPACE}Core::${NAMESPACE}Core