diff --git a/CMakeLists.txt b/CMakeLists.txt
index 417789a..9fa48a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,17 @@ set(HPX_KOKKOS_VERSION_STRING "${HPX_KOKKOS_VERSION_MAJOR}.${HPX_KOKKOS_VERSION_
 
 # Dependencies
 find_package(HPX 1.8.1 REQUIRED)
-# TODO: The version requirement needs to be bumped once
-# https://github.com/kokkos/kokkos/pull/5628 is merged and released.
-find_package(Kokkos 3.7.99 REQUIRED)
+find_package(Kokkos 3.6.00 REQUIRED)
+
+# Check that Kokkos and HPX options are consistent.
+
+if(Kokkos_VERSION VERSION_LESS 4.1.00)
+  message(INFO " Using Kokkos Version with HPX futures backend")
+  kokkos_check(DEVICES HPX OPTIONS HPX_ASYNC_DISPATCH)
+else()
+  message(INFO " Using Kokkos Version with HPX Sender/Receiver backend")
+  kokkos_check(DEVICES HPX)
+endif()
 
 if(Kokkos_ENABLE_CUDA)
   kokkos_check(OPTIONS CUDA_LAMBDA CUDA_LAMBDA)