diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28d0229e..74eb4cf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 FetchContent_Declare(
     Catch2
     GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v3.4.0)
+    GIT_TAG v3.4.0
+    FIND_PACKAGE_ARGS)
 
 # Perhaps one day use Microsoft.GSL if
 # https://github.com/microsoft/GSL/issues/991 gets addressed
diff --git a/cmake/FetchBoost.cmake b/cmake/FetchBoost.cmake
index 73a7a2c6..2ea0d539 100644
--- a/cmake/FetchBoost.cmake
+++ b/cmake/FetchBoost.cmake
@@ -4,7 +4,9 @@ FetchContent_Declare(
         URL_HASH SHA256=7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5
         DOWNLOAD_EXTRACT_TIMESTAMP ON
         EXCLUDE_FROM_ALL
+        FIND_PACKAGE_ARGS CONFIG
 )
 
 set(BOOST_INCLUDE_LIBRARIES any callable_traits mpl)
+set(BOOST_ENABLE_COMPATIBILITY_TARGETS ON)
 FetchContent_MakeAvailable(Boost)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6e4a232..4378dbe8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,8 +62,7 @@ target_link_libraries(Oasis PUBLIC Oasis::Headers Eigen3::Eigen
                                    gsl::gsl-lite-v1)
 
 if(NOT OASIS_BUILD_JS)
-    target_link_libraries(Oasis PUBLIC Boost::any Boost::callable_traits
-                                       Boost::mpl)
+    target_link_libraries(Oasis PUBLIC Boost::boost)
 endif()
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${Oasis_SOURCES})