diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6be6e8..5e0b537 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,17 +163,17 @@ if (ENABLE_MYRIAD_NO_BOOT)
         NO_BOOT)
 endif()
 
-# Set C99 standard
-set_property(TARGET ${TARGET_NAME} PROPERTY C_STANDARD 99)
-# Set compiler features (c++11), and disables extensions (g++11)
-set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11)
+# Set C11 standard
+set_property(TARGET ${TARGET_NAME} PROPERTY C_STANDARD 11)
+# Set compiler features (c++17), and disables extensions (g++17)
+set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 17)
 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_EXTENSIONS OFF)
-# Add interface transitive property (C++11) to public library
+# Add interface transitive property (C++17) to public library
 if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
     target_compile_features(${TARGET_PUBLIC_NAME} INTERFACE cxx_range_for)
 else()
-    target_compile_features(${TARGET_PUBLIC_NAME} INTERFACE cxx_std_11)
+    target_compile_features(${TARGET_PUBLIC_NAME} INTERFACE cxx_std_17)
 endif()
 
 # Add flags