diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66ae4894a..601688fa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -787,7 +787,11 @@ if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
                 TYPE OPTIONAL
             )
             if(${FILESYSTEM_FOUND})
-                set(CMAKE_CXX_STANDARD 17)
+                if(CMAKE_VERSION VERSION_LESS 3.12)
+                    set(CMAKE_CXX_STANDARD 17)
+                else()
+                    set(CMAKE_CXX_STANDARD 20)
+                endif()
                 set(CMAKE_CXX_STANDARD_REQUIRED ON)
             endif()
         endif()
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 8d515f584..86b4eab9d 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -95,7 +95,11 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
             set(CMAKE_CXX_STANDARD 14)
         else()
             if(${FILESYSTEM_FOUND})
-                set(CMAKE_CXX_STANDARD 17)
+                if(CMAKE_VERSION VERSION_LESS 3.12)
+                    set(CMAKE_CXX_STANDARD 17)
+                else()
+                    set(CMAKE_CXX_STANDARD 20)
+                endif()
                 set(CMAKE_CXX_STANDARD_REQUIRED ON)
             else()
                 set(CMAKE_CXX_STANDARD 14)