diff --git a/CMakeLists.txt b/CMakeLists.txt
index 528c1e2..e9ceab3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(NAM VERSION 0.3.0)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED OFF)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index ee71722..1e09436 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable(run_tests run_tests.cpp ${NAM_SOURCES})
 
 source_group(NAM ${CMAKE_CURRENT_SOURCE_DIR} FILES ${NAM_SOURCES})
 
-target_compile_features(${TOOLS} PUBLIC cxx_std_17)
+target_compile_features(${TOOLS} PUBLIC cxx_std_20)
 
 set_target_properties(${TOOLS}
 	PROPERTIES