diff --git a/rmw_connextdds/CMakeLists.txt b/rmw_connextdds/CMakeLists.txt
index f10489f6..649ebec8 100644
--- a/rmw_connextdds/CMakeLists.txt
+++ b/rmw_connextdds/CMakeLists.txt
@@ -16,9 +16,9 @@ cmake_minimum_required(VERSION 3.20)
 
 project(rmw_connextdds)
 
-# Default to C++17
+# Default to C++20
 if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 20)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
diff --git a/rmw_connextdds_common/CMakeLists.txt b/rmw_connextdds_common/CMakeLists.txt
index 6506b2d1..b5490953 100644
--- a/rmw_connextdds_common/CMakeLists.txt
+++ b/rmw_connextdds_common/CMakeLists.txt
@@ -38,9 +38,9 @@ function(rtirmw_add_library)
       ${ARGN} # current function arguments
     )
 
-    # Default to C++17
+    # Default to C++20
     if(NOT CMAKE_CXX_STANDARD)
-        set(CMAKE_CXX_STANDARD 17)
+        set(CMAKE_CXX_STANDARD 20)
         set(CMAKE_CXX_STANDARD_REQUIRED ON)
     endif()
 
diff --git a/rmw_connextddsmicro/CMakeLists.txt b/rmw_connextddsmicro/CMakeLists.txt
index 07124df7..d17ce8a2 100644
--- a/rmw_connextddsmicro/CMakeLists.txt
+++ b/rmw_connextddsmicro/CMakeLists.txt
@@ -16,9 +16,9 @@ cmake_minimum_required(VERSION 3.20)
 
 project(rmw_connextddsmicro)
 
-# Default to C++17
+# Default to C++20
 if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 20)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()