diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh
index 9842f4c2..54419dce 100644
--- a/ci/linux-presubmit.sh
+++ b/ci/linux-presubmit.sh
@@ -31,8 +31,7 @@
 
 set -euox pipefail
 
-readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20250430"
-readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250430"
+readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20260131"
 
 if [[ -z ${GTEST_ROOT:-} ]]; then
   GTEST_ROOT="$(realpath $(dirname ${0})/..)"
@@ -79,7 +78,7 @@ for cmake_off_on in OFF ON; do
     --tmpfs="/build:exec" \
     --workdir="/build" \
     --rm \
-    --env="CC=/opt/llvm/clang/bin/clang" \
+    --env="CC=/opt/llvm/bin/clang" \
     --env=CXXFLAGS="-Werror -Wdeprecated --gcc-toolchain=/usr/local" \
     ${LINUX_LATEST_CONTAINER} \
     /bin/bash -c "
@@ -99,10 +98,12 @@ time docker run \
   --volume="${GTEST_ROOT}:/src:ro" \
   --workdir="/src" \
   --rm \
-  --env="CC=/usr/local/bin/gcc" \
+  --env="CC=/opt/gcc-9/bin/gcc" \
   --env="BAZEL_CXXOPTS=-std=c++17" \
+  --env="BAZEL_LINKOPTS=-L/opt/gcc-9/lib64:-Wl,-rpath=/opt/gcc-9/lib64" \
+  --env="USE_BAZEL_VERSION=8.5.1" \
   ${DOCKER_EXTRA_ARGS:-} \
-  ${LINUX_GCC_FLOOR_CONTAINER} \
+  ${LINUX_LATEST_CONTAINER} \
   /bin/bash --login -c "
     /usr/local/bin/bazel test ... \
       --copt=\"-Wall\" \
@@ -111,6 +112,7 @@ time docker run \
       --copt=\"-Wundef\" \
       --copt=\"-Wno-error=pragmas\" \
       --enable_bzlmod=false \
+      --enable_workspace=true \
       --features=external_include_paths \
       --keep_going \
       --per_file_copt=\"external/.*@-w\" \
@@ -127,6 +129,7 @@ for std in ${STD}; do
       --rm \
       --env="CC=/usr/local/bin/gcc" \
       --env="BAZEL_CXXOPTS=-std=${std}" \
+      --env="USE_BAZEL_VERSION=8.5.1" \
       ${DOCKER_EXTRA_ARGS:-} \
       ${LINUX_LATEST_CONTAINER} \
       /bin/bash --login -c "
@@ -153,8 +156,9 @@ for std in ${STD}; do
       --volume="${GTEST_ROOT}:/src:ro" \
       --workdir="/src" \
       --rm \
-      --env="CC=/opt/llvm/clang/bin/clang" \
+      --env="CC=/opt/llvm/bin/clang" \
       --env="BAZEL_CXXOPTS=-std=${std}" \
+      --env="USE_BAZEL_VERSION=8.5.1" \
       ${DOCKER_EXTRA_ARGS:-} \
       ${LINUX_LATEST_CONTAINER} \
       /bin/bash --login -c "
diff --git a/ci/macos-presubmit.sh b/ci/macos-presubmit.sh
index 4278ec27..5fac6ae9 100644
--- a/ci/macos-presubmit.sh
+++ b/ci/macos-presubmit.sh
@@ -56,7 +56,7 @@ done
 # Test the Bazel build
 
 # If we are running on Kokoro, check for a versioned Bazel binary.
-KOKORO_GFILE_BAZEL_BIN="bazel-8.2.1-darwin-x86_64"
+KOKORO_GFILE_BAZEL_BIN="bazel-8.5.1-darwin-x86_64"
 if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
   BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
   chmod +x ${BAZEL_BIN}
diff --git a/ci/windows-presubmit.bat b/ci/windows-presubmit.bat
index de3de5a8..2bfc4cd9 100644
--- a/ci/windows-presubmit.bat
+++ b/ci/windows-presubmit.bat
@@ -1,6 +1,6 @@
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-8.2.1-windows-x86_64.exe
+SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-8.5.1-windows-x86_64.exe
 
 SET PATH=C:\Python34;%PATH%
 SET BAZEL_PYTHON=C:\python34\python.exe