diff --git a/cmake/HPX_SetupBoost.cmake b/cmake/HPX_SetupBoost.cmake
index 43360e5571d..ed65023a1ac 100644
--- a/cmake/HPX_SetupBoost.cmake
+++ b/cmake/HPX_SetupBoost.cmake
@@ -109,7 +109,7 @@ if(NOT TARGET hpx_dependencies_boost)
   hpx_set_cmake_policy(CMP0167 OLD) # use CMake's FindBoost for now
 
   # Find the headers and get the version
-  find_package(Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE MODULE REQUIRED)
+  find_package(Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE CONFIG REQUIRED)
   if(NOT Boost_VERSION_STRING)
     set(Boost_VERSION_STRING
         "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}"
@@ -142,7 +142,7 @@ if(NOT TARGET hpx_dependencies_boost)
   endif()
 
   find_package(
-    Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE MODULE REQUIRED
+    Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE CONFIG REQUIRED
     COMPONENTS ${__boost_libraries}
   )
 
diff --git a/cmake/HPX_SetupBoostFilesystem.cmake b/cmake/HPX_SetupBoostFilesystem.cmake
index 65b69a14392..32626a633a2 100644
--- a/cmake/HPX_SetupBoostFilesystem.cmake
+++ b/cmake/HPX_SetupBoostFilesystem.cmake
@@ -10,7 +10,7 @@ if(HPX_FILESYSTEM_WITH_BOOST_FILESYSTEM_COMPATIBILITY)
     hpx_set_cmake_policy(CMP0167 OLD) # use CMake's FindBoost for now
 
     find_package(
-      Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE MODULE
+      Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE CONFIG
       COMPONENTS filesystem
     )
 
diff --git a/cmake/HPX_SetupBoostIostreams.cmake b/cmake/HPX_SetupBoostIostreams.cmake
index 92c68bf44f7..0ab830a661e 100644
--- a/cmake/HPX_SetupBoostIostreams.cmake
+++ b/cmake/HPX_SetupBoostIostreams.cmake
@@ -12,7 +12,7 @@ if((HPX_WITH_COMPRESSION_BZIP2
   hpx_set_cmake_policy(CMP0167 OLD) # use CMake's FindBoost for now
 
   find_package(
-    Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE MODULE COMPONENTS iostreams
+    Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE CONFIG COMPONENTS iostreams
   )
 
   if(Boost_IOSTREAMS_FOUND)
diff --git a/cmake/HPX_SetupBoostRegex.cmake b/cmake/HPX_SetupBoostRegex.cmake
index c3ab0448dbd..578710fdd72 100644
--- a/cmake/HPX_SetupBoostRegex.cmake
+++ b/cmake/HPX_SetupBoostRegex.cmake
@@ -8,7 +8,7 @@ if(NOT TARGET Boost::regex)
   hpx_set_cmake_policy(CMP0167 OLD) # use CMake's FindBoost for now
 
   find_package(
-    Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE MODULE COMPONENTS regex
+    Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE CONFIG COMPONENTS regex
   )
 
   if(Boost_REGEX_FOUND)