diff --git a/cmake/dependencies/Boost_Sunshine.cmake b/cmake/dependencies/Boost_Sunshine.cmake
index 72ab5443..dc13bb0e 100644
--- a/cmake/dependencies/Boost_Sunshine.cmake
+++ b/cmake/dependencies/Boost_Sunshine.cmake
@@ -15,14 +15,19 @@ if(BOOST_USE_STATIC)
     set(Boost_USE_STATIC_LIBS ON)  # cmake-lint: disable=C0103
 endif()
 
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
+    cmake_policy(SET CMP0167 NEW)  # Get BoostConfig.cmake from upstream
+endif()
 find_package(Boost CONFIG ${BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS})
 if(NOT Boost_FOUND)
     message(STATUS "Boost v${BOOST_VERSION}.x package not found in the system. Falling back to FetchContent.")
     include(FetchContent)
 
-    # Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
     if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
-        cmake_policy(SET CMP0135 NEW)
+        cmake_policy(SET CMP0135 NEW)  # Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24
+    endif()
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.31.0")
+        cmake_policy(SET CMP0174 NEW)  # Handle empty variables
     endif()
 
     # more components required for compiling boost targets
diff --git a/cmake/dependencies/nlohmann_json.cmake b/cmake/dependencies/nlohmann_json.cmake
index c0029b42..11000c8d 100644
--- a/cmake/dependencies/nlohmann_json.cmake
+++ b/cmake/dependencies/nlohmann_json.cmake
@@ -8,6 +8,13 @@ if(NOT nlohmann_json_FOUND)
     message(STATUS "nlohmann_json v3.11.x package not found in the system. Falling back to FetchContent.")
     include(FetchContent)
 
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+        cmake_policy(SET CMP0135 NEW)  # Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24
+    endif()
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.31.0")
+        cmake_policy(SET CMP0174 NEW)  # Handle empty variables
+    endif()
+
     FetchContent_Declare(
             json
             URL      https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index de67f0bc..8d4c08e3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 project(sunshine_tools)