diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6c976e..983cfe9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libpfr/inc)
diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index a3a15a2..ce08540 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(pfr-manager CXX)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Temporarily disable rtti
 # See https://github.com/chriskohlhoff/asio/issues/533