diff --git a/.github/workflows/python-cibuildwheel.yml b/.github/workflows/python-cibuildwheel.yml
index 166f201d0..f01a4af01 100644
--- a/.github/workflows/python-cibuildwheel.yml
+++ b/.github/workflows/python-cibuildwheel.yml
@@ -64,8 +64,7 @@ jobs:
         run: |
           brew update && \
           brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done && \
-          brew install ccache zlib snappy boost@1.85
-          brew link boost@1.85
+          brew install ccache zlib snappy boost
 
       - name: set mac deployment target X64
         if: runner.os == 'macOS' && runner.arch == 'X64'
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 47a7fa526..14393de4a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install system packages
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 452d3f09d..511b68dff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,18 +65,30 @@ set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 
-find_package(Boost REQUIRED COMPONENTS ${_KEYVI_BOOST_LIBRARIES} ${_KEYVI_BOOST_LIBRARIES_TEST})
+if(POLICY CMP0167) # Use upstream's FindBoost.cmake to find Boost libraries.
+  cmake_policy(SET CMP0167 NEW)
+endif()
+
+find_package(Boost 1.80 REQUIRED COMPONENTS ${_KEYVI_BOOST_LIBRARIES} ${_KEYVI_BOOST_LIBRARIES_TEST})
 if (Boost_FOUND)
     list(APPEND KEYVI_INCLUDES "${Boost_INCLUDE_DIRS}")
 else ()
     message(FATAL_ERROR "Can not find Boost")
 endif ()
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread-mt")
+    set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread")
 else ()
     set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread")
 endif ()
 
+if(Boost_VERSION VERSION_GREATER_EQUAL "1.86.0")
+    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+        set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_process")
+    else ()
+        set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_process")
+    endif ()
+endif ()
+
 if (WIN32)
   # required for libboost_zlib
   # disable autolinking in boost