diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8114f332..de29b9c7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ if(GMGPOLAR_ENABLE_COVERAGE)
 endif()
 
 find_package(OpenMP REQUIRED COMPONENTS CXX)
-find_package(Kokkos  4.4.1...<5.1 QUIET REQUIRED)
+find_package(Kokkos 4.4.1...<6 QUIET REQUIRED)
 
 if(GMGPOLAR_USE_MUMPS)
     find_package(MUMPS REQUIRED COMPONENTS OpenMP METIS)
diff --git a/cmake/GMGPolarConfig.cmake.in b/cmake/GMGPolarConfig.cmake.in
index 228a0644..390a06a6 100644
--- a/cmake/GMGPolarConfig.cmake.in
+++ b/cmake/GMGPolarConfig.cmake.in
@@ -4,15 +4,15 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(OpenMP REQUIRED)
-find_dependency(Kokkos REQUIRED)
+find_dependency(OpenMP COMPONENTS CXX)
+find_dependency(Kokkos)
 
 if(@GMGPOLAR_USE_MUMPS@)
-    find_dependency(MUMPS REQUIRED)
+    find_dependency(MUMPS COMPONENTS OpenMP METIS)
 endif()
 
 if(@GMGPOLAR_USE_LIKWID@)
-    find_dependency(LIKWID REQUIRED)
+    find_dependency(LIKWID)
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/GMGPolarTargets.cmake")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8537bb99..fa6675aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,6 +53,9 @@ add_library(GMGPolarLib STATIC
     ${INTERPOLATION_SOURCES}
 )
 
+# Declare C++20 is a minimum required to use GMGPolarLib headers
+target_compile_features(GMGPolarLib INTERFACE cxx_std_20)
+
 # Basic library configuration
 target_include_directories(GMGPolarLib PUBLIC
     ${GMGPOLAR_INCLUDE_DIRS}
@@ -82,6 +85,8 @@ add_library(GMGPolar::GMGPolarLib ALIAS GMGPolarLib)
 add_library(GMGPolarInterface STATIC
     ${CONFIG_PARSER_SOURCES}
 )
+# Declare C++20 is a minimum required to use GMGPolarInterface headers
+target_compile_features(GMGPolarInterface INTERFACE cxx_std_20)
 target_link_libraries(GMGPolarInterface
     PUBLIC
     GMGPolarLib