diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake
index 4cff2ce6..ba378cbb 100644
--- a/cmake/targets/common.cmake
+++ b/cmake/targets/common.cmake
@@ -27,7 +27,7 @@ endif()
 
 target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES} ${EXTRA_LIBS})
 target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS})
-set_target_properties(sunshine PROPERTIES CXX_STANDARD 20
+set_target_properties(sunshine PROPERTIES CXX_STANDARD 23
         VERSION ${PROJECT_VERSION}
         SOVERSION ${PROJECT_VERSION_MAJOR})
 
diff --git a/packaging/sunshine.rb b/packaging/sunshine.rb
index ad7b46ee..ff630cbd 100644
--- a/packaging/sunshine.rb
+++ b/packaging/sunshine.rb
@@ -206,7 +206,7 @@ index 5b3638d..aca9481 100644
 
     args = %W[
       -DBUILD_WERROR=ON
-      -DCMAKE_CXX_STANDARD=20
+      -DCMAKE_CXX_STANDARD=23
       -DCMAKE_INSTALL_PREFIX=#{prefix}
       -DHOMEBREW_ALLOW_FETCHCONTENT=ON
       -DOPENSSL_ROOT_DIR=#{Formula["openssl"].opt_prefix}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 927c12b7..b15a53fd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -56,7 +56,7 @@ foreach(dep ${SUNSHINE_TARGET_DEPENDENCIES})
     add_dependencies(${PROJECT_NAME} ${dep})  # compile these before sunshine
 endforeach()
 
-set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 20)
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 23)
 target_link_libraries(${PROJECT_NAME}
         ${SUNSHINE_EXTERNAL_LIBRARIES}
         gtest
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 59651565..26cee550 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -5,7 +5,7 @@ project(sunshine_tools)
 include_directories("${CMAKE_SOURCE_DIR}")
 
 add_executable(dxgi-info dxgi.cpp)
-set_target_properties(dxgi-info PROPERTIES CXX_STANDARD 20)
+set_target_properties(dxgi-info PROPERTIES CXX_STANDARD 23)
 target_link_libraries(dxgi-info
         ${CMAKE_THREAD_LIBS_INIT}
         dxgi
@@ -13,7 +13,7 @@ target_link_libraries(dxgi-info
 target_compile_options(dxgi-info PRIVATE ${SUNSHINE_COMPILE_OPTIONS})
 
 add_executable(audio-info audio.cpp)
-set_target_properties(audio-info PROPERTIES CXX_STANDARD 20)
+set_target_properties(audio-info PROPERTIES CXX_STANDARD 23)
 target_link_libraries(audio-info
         ${Boost_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
@@ -22,7 +22,7 @@ target_link_libraries(audio-info
 target_compile_options(audio-info PRIVATE ${SUNSHINE_COMPILE_OPTIONS})
 
 add_executable(sunshinesvc sunshinesvc.cpp)
-set_target_properties(sunshinesvc PROPERTIES CXX_STANDARD 20)
+set_target_properties(sunshinesvc PROPERTIES CXX_STANDARD 23)
 target_link_libraries(sunshinesvc
         ${CMAKE_THREAD_LIBS_INIT}
         wtsapi32