diff --git a/.bazelignore b/.bazelignore
index 9c6ed55..4f81262 100644
--- a/.bazelignore
+++ b/.bazelignore
@@ -4,3 +4,4 @@ out
 cmake-build-debug
 third_party
 
+.clwb
diff --git a/.github/workflows/bazel-macos.yml b/.github/workflows/bazel-macos.yml
index 0736d54..6ebd611 100644
--- a/.github/workflows/bazel-macos.yml
+++ b/.github/workflows/bazel-macos.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       # This causes build failures
       #      - name: Mount bazel cache  # Optional
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index 8218b7b..4cc458c 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Setup bazel
-        uses: bazelbuild/setup-bazelisk@v2
+        uses: bazelbuild/setup-bazelisk@v3
 
       # This causes build failures
       #      - name: Mount bazel cache  # Optional
diff --git a/.github/workflows/cmake-codecov.yml b/.github/workflows/cmake-codecov.yml
index 6b970ae..2d04078 100644
--- a/.github/workflows/cmake-codecov.yml
+++ b/.github/workflows/cmake-codecov.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - uses: hendrikmuhs/ccache-action@v1.2
 
@@ -42,8 +42,8 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: |
           cd test/CMakeFiles/all_tests.dir/
-          lcov --directory . --capture -o coverage.info
-          lcov -r coverage.info */build/* */test/* */c++/* */gtest/* -o coverageFiltered.info
-          lcov --list coverageFiltered.info
+          lcov --directory . --capture -o coverage.info --ignore-errors mismatch
+          lcov -r coverage.info */build/* */test/* */c++/* -o coverageFiltered.info --ignore-errors mismatch
+          lcov --list coverageFiltered.info --ignore-errors mismatch
           bash <(curl -s https://codecov.io/bash) -f coverageFiltered.info || echo "Upload failed"
 
diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
index 7cf6c60..e72d9f2 100644
--- a/.github/workflows/cmake-windows.yml
+++ b/.github/workflows/cmake-windows.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - uses: hendrikmuhs/ccache-action@v1.2
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffb26b2..c4facf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Nothing yet
+
+### Changed
+- Added support for bazel 8 and 9, thanks to @polasek
+  [#161](https://github.com/tzaeschke/phtree-cpp/issues/161)
 
 ## [1.6.2] - 2025-03-08
 ### Fixed