diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 710c75a421e..3f050041cf1 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -5,7 +5,7 @@ on:
 permissions: {}
 jobs:
   Fuzzing:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       security-events: write
     steps:
diff --git a/tests/fuzzing/oss-fuzz.sh b/tests/fuzzing/oss-fuzz.sh
index 601fe308755..d02521d8665 100644
--- a/tests/fuzzing/oss-fuzz.sh
+++ b/tests/fuzzing/oss-fuzz.sh
@@ -26,7 +26,7 @@ unset CXXFLAGS
 unset RUSTFLAGS
 export AFL_NOOPT=1
 
-apt-get install -y libev-dev libjemalloc-dev python2-dev libxml2-dev libpython2-dev libc-ares-dev libsystemd-dev libevent-dev libjansson-dev zlib1g-dev sudo autoconf libtool pkg-config
+apt-get install -y libev-dev libjemalloc-dev python3-dev libxml2-dev libpython3-dev libpsl-dev libc-ares-dev libsystemd-dev libevent-dev libjansson-dev zlib1g-dev sudo autoconf libtool pkg-config
 curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=nightly
 export PATH="/root/.cargo/bin:${PATH}"
 
@@ -63,6 +63,11 @@ cp /opt/h3-tools-boringssl/boringssl/lib/libssl.so $OUT/lib/
 cp /opt/h3-tools-boringssl/boringssl/lib/libcrypto.so $OUT/lib/
 cp /opt/h3-tools-boringssl/quiche/lib/libquiche.so $OUT/lib/
 cp /opt/h3-tools-boringssl/quiche/lib/libquiche.so $OUT/lib/libquiche.so.0
+
+cd $OUT/lib
+ln -sf libswoc.so.1.5.15 libswoc.so.1
+ln -sf libswoc.so.1.5.15 libswoc.so
+
 export LD_LIBRARY_PATH=$OUT/lib/
 ldconfig
 
diff --git a/tools/build_boringssl_h3_tools.sh b/tools/build_boringssl_h3_tools.sh
index 2bfd8932a07..286e5d15098 100755
--- a/tools/build_boringssl_h3_tools.sh
+++ b/tools/build_boringssl_h3_tools.sh
@@ -112,7 +112,7 @@ else
     OS="linux"
 fi
 
-go_version=1.24.1
+go_version=1.24.12
 wget https://go.dev/dl/go${go_version}.${OS}-${ARCH}.tar.gz
 rm -rf ${BASE}/go && tar -C ${BASE} -xf go${go_version}.${OS}-${ARCH}.tar.gz
 rm go${go_version}.${OS}-${ARCH}.tar.gz
@@ -121,7 +121,7 @@ GO_BINARY_PATH=${BASE}/go/bin/go
 if [ ! -d boringssl ]; then
   git clone https://boringssl.googlesource.com/boringssl
   cd boringssl
-  git checkout 45b2464158379f48cec6e35a1ef503ddea1511a6
+  git checkout 02bc0949e5cac0e1ee82c6f365f5a6c3cfd0cfa9
   cd ..
 fi
 cd boringssl
@@ -146,18 +146,24 @@ cmake \
   -DGO_EXECUTABLE=${GO_BINARY_PATH} \
   -DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
+  -DCMAKE_CXX_FLAGS='-Wno-error=character-conversion -Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
   -DCMAKE_C_FLAGS=${BSSL_C_FLAGS} \
   -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+  -DBUILD_TESTING=0 \
+  -DCMAKE_THREAD_LIBS_INIT="-lpthread" \
+  -DTHREADS_PREFER_PTHREAD_FLAG=ON \
   -DBUILD_SHARED_LIBS=1
 cmake \
   -B build-static \
   -DGO_EXECUTABLE=${GO_BINARY_PATH} \
   -DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
+  -DCMAKE_CXX_FLAGS='-Wno-error=character-conversion -Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
   -DCMAKE_C_FLAGS="${BSSL_C_FLAGS}" \
   -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+  -DBUILD_TESTING=0 \
+  -DCMAKE_THREAD_LIBS_INIT="-lpthread" \
+  -DTHREADS_PREFER_PTHREAD_FLAG=ON \
   -DBUILD_SHARED_LIBS=0
 cmake --build build-shared -j ${num_threads}
 cmake --build build-static -j ${num_threads}