diff --git a/projects/libzip/Dockerfile b/projects/libzip/Dockerfile
index 62826a479da8..c52faff3240f 100644
--- a/projects/libzip/Dockerfile
+++ b/projects/libzip/Dockerfile
@@ -15,7 +15,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 
 RUN apt-get update && apt-get install -y cmake pkg-config zlib1g-dev libbz2-dev liblzma-dev libzstd-dev
diff --git a/projects/libzip/project.yaml b/projects/libzip/project.yaml
index 34a7daab20a2..dfff153ae8dc 100644
--- a/projects/libzip/project.yaml
+++ b/projects/libzip/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://libzip.org/"
 language: c++
 primary_contact: "libzip@nih.at"
diff --git a/projects/libzmq/Dockerfile b/projects/libzmq/Dockerfile
index 9617ecc94406..548f08959f64 100644
--- a/projects/libzmq/Dockerfile
+++ b/projects/libzmq/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool gettext pkg-config build-essential
 RUN git clone --depth 1 https://github.com/zeromq/libzmq.git
 RUN git clone --depth 1 https://github.com/zeromq/libzmq-fuzz-corpora.git
diff --git a/projects/libzmq/project.yaml b/projects/libzmq/project.yaml
index e079c6fc9957..f6d5a84566a6 100644
--- a/projects/libzmq/project.yaml
+++ b/projects/libzmq/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/zeromq/libzmq"
 language: c++
 primary_contact: "bluca@debian.org"
diff --git a/projects/lighttpd/Dockerfile b/projects/lighttpd/Dockerfile
index c0921e4db9c7..f6b6c9684185 100755
--- a/projects/lighttpd/Dockerfile
+++ b/projects/lighttpd/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y libz-dev libpcre2-dev libtool pkg-config autoconf
 RUN git clone https://github.com/lighttpd/lighttpd1.4
 
diff --git a/projects/lighttpd/project.yaml b/projects/lighttpd/project.yaml
index 71dc45776dd4..3c05087651b5 100755
--- a/projects/lighttpd/project.yaml
+++ b/projects/lighttpd/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.lighttpd.net/"
 primary_contact: "lighttpd.fuzz@gmail.com"
 language: c
diff --git a/projects/linkerd2-proxy/Dockerfile b/projects/linkerd2-proxy/Dockerfile
index 83f71b6b92e6..2e33b7565b1c 100644
--- a/projects/linkerd2-proxy/Dockerfile
+++ b/projects/linkerd2-proxy/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 RUN apt-get --yes update \
    && apt-get install --no-install-recommends --yes \
    libssl-dev \
diff --git a/projects/linkerd2-proxy/project.yaml b/projects/linkerd2-proxy/project.yaml
index c7ce398edcf4..e2b2ffaf215b 100644
--- a/projects/linkerd2-proxy/project.yaml
+++ b/projects/linkerd2-proxy/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://linkerd.io/"
 main_repo: "https://github.com/linkerd/linkerd2-proxy"
 primary_contact: "ver@buoyant.io"
diff --git a/projects/linkerd2/Dockerfile b/projects/linkerd2/Dockerfile
index 83dc23ce174f..70019001b221 100644
--- a/projects/linkerd2/Dockerfile
+++ b/projects/linkerd2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/linkerd/linkerd2
 COPY build.sh $SRC/
 WORKDIR $SRC/linkerd2
diff --git a/projects/linkerd2/project.yaml b/projects/linkerd2/project.yaml
index 50b78c800aeb..64a5f0c67e24 100644
--- a/projects/linkerd2/project.yaml
+++ b/projects/linkerd2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://linkerd.io/"
 main_repo: "https://github.com/linkerd/linkerd2"
 primary_contact: "ver@buoyant.io"
diff --git a/projects/lit/Dockerfile b/projects/lit/Dockerfile
index ae2f27775c19..f616a6458602 100644
--- a/projects/lit/Dockerfile
+++ b/projects/lit/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-javascript
+FROM gcr.io/oss-fuzz-base/base-builder-javascript:ubuntu-24-04
 
 COPY build.sh $SRC/
 
diff --git a/projects/lit/project.yaml b/projects/lit/project.yaml
index 74c9bb646189..b91964dc0574 100644
--- a/projects/lit/project.yaml
+++ b/projects/lit/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://lit.dev/
 language: javascript
 main_repo: https://github.com/lit/lit
diff --git a/projects/litmuschaos/Dockerfile b/projects/litmuschaos/Dockerfile
index 0da02390c532..ea61d83de750 100644
--- a/projects/litmuschaos/Dockerfile
+++ b/projects/litmuschaos/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone https://github.com/litmuschaos/litmus.git
 RUN git clone https://github.com/litmuschaos/chaos-exporter.git
 RUN git clone https://github.com/litmuschaos/litmus-go.git
diff --git a/projects/litmuschaos/project.yaml b/projects/litmuschaos/project.yaml
index c4a6bd736554..476b851ccf3c 100644
--- a/projects/litmuschaos/project.yaml
+++ b/projects/litmuschaos/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://litmuschaos.io/"
 main_repo: "https://github.com/litmuschaos/litmus.git"
 primary_contact: "saranya.jena@harness.io"
diff --git a/projects/llamacpp/Dockerfile b/projects/llamacpp/Dockerfile
index d2e8d1e967cc..df8c60f32e00 100644
--- a/projects/llamacpp/Dockerfile
+++ b/projects/llamacpp/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake xxd
 RUN git clone https://github.com/ggerganov/llama.cpp
 WORKDIR $SRC/llama.cpp
diff --git a/projects/llamacpp/project.yaml b/projects/llamacpp/project.yaml
index d2e8abff64d4..2bde97a48e59 100644
--- a/projects/llamacpp/project.yaml
+++ b/projects/llamacpp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ggerganov/llama.cpp"
 language: c++
 primary_contact: "ggerganov@gmail.com"
diff --git a/projects/lldpd/Dockerfile b/projects/lldpd/Dockerfile
index 088192562c3e..717700670a6e 100644
--- a/projects/lldpd/Dockerfile
+++ b/projects/lldpd/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y autoconf libtool-bin pkg-config
 RUN git clone --recursive https://github.com/lldpd/lldpd.git
 COPY build.sh $SRC/
diff --git a/projects/lldpd/project.yaml b/projects/lldpd/project.yaml
index 7c3aa40de6f3..17c37cfdaf7d 100644
--- a/projects/lldpd/project.yaml
+++ b/projects/lldpd/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://lldpd.github.io"
 language: c
 primary_contact: "vincent@bernat.ch"
diff --git a/projects/llhttp/Dockerfile b/projects/llhttp/Dockerfile
index 388a540f21c4..258abad3f983 100644
--- a/projects/llhttp/Dockerfile
+++ b/projects/llhttp/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update \
     && apt-get install -y make autoconf automake libtool
 RUN install_javascript.sh
diff --git a/projects/llhttp/project.yaml b/projects/llhttp/project.yaml
index dda736aaedf3..605c273f3fe9 100644
--- a/projects/llhttp/project.yaml
+++ b/projects/llhttp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://llhttp.org/"
 main_repo: "https://github.com/nodejs/llhttp"
 language: c
diff --git a/projects/llvm/Dockerfile b/projects/llvm/Dockerfile
index 6d6d34638960..0dfffcc0d1c4 100644
--- a/projects/llvm/Dockerfile
+++ b/projects/llvm/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update -y && \
     apt-get install -y autoconf automake libtool curl make g++ unzip wget git \
     binutils liblzma-dev libz-dev python-all cmake ninja-build subversion \
diff --git a/projects/llvm/project.yaml b/projects/llvm/project.yaml
index 8d04b383902a..4f984aebdfa5 100644
--- a/projects/llvm/project.yaml
+++ b/projects/llvm/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://llvm.org/"
 language: c++
 primary_contact: "rnk@google.com"
diff --git a/projects/llvm_libcxxabi/Dockerfile b/projects/llvm_libcxxabi/Dockerfile
index 1dd456276793..106d88e80031 100644
--- a/projects/llvm_libcxxabi/Dockerfile
+++ b/projects/llvm_libcxxabi/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/llvm/llvm-project.git
 WORKDIR llvm-project/libcxxabi
diff --git a/projects/llvm_libcxxabi/project.yaml b/projects/llvm_libcxxabi/project.yaml
index 0730a4c418f6..c8cc65f7ce4a 100644
--- a/projects/llvm_libcxxabi/project.yaml
+++ b/projects/llvm_libcxxabi/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://libcxxabi.llvm.org/"
 language: c++
 primary_contact: "kcc@google.com"
diff --git a/projects/lodash/Dockerfile b/projects/lodash/Dockerfile
index 1ec85a1d8d23..17635a31c526 100644
--- a/projects/lodash/Dockerfile
+++ b/projects/lodash/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-javascript
+FROM gcr.io/oss-fuzz-base/base-builder-javascript:ubuntu-24-04
 
 COPY build.sh $SRC/
 
diff --git a/projects/lodash/project.yaml b/projects/lodash/project.yaml
index 43331e310977..0f143284d0e3 100644
--- a/projects/lodash/project.yaml
+++ b/projects/lodash/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://lodash.com/
 language: javascript
 main_repo: https://github.com/lodash/lodash
diff --git a/projects/lodepng/Dockerfile b/projects/lodepng/Dockerfile
index 2666050897c9..1c7c1dbc534b 100644
--- a/projects/lodepng/Dockerfile
+++ b/projects/lodepng/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/lvandeve/lodepng.git lodepng     # or use other version control
 WORKDIR lodepng
diff --git a/projects/lodepng/project.yaml b/projects/lodepng/project.yaml
index babb4c9d17b4..6fa004b4a7c4 100644
--- a/projects/lodepng/project.yaml
+++ b/projects/lodepng/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/lvandeve/lodepng"
 language: c++
 primary_contact: "lvandeve@gmail.com"
diff --git a/projects/log4j2/Dockerfile b/projects/log4j2/Dockerfile
index dd3b35b8c092..1df4d4727fae 100644
--- a/projects/log4j2/Dockerfile
+++ b/projects/log4j2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 # Install Java 17 using Azul Zulu distribution, because
 #
diff --git a/projects/log4j2/project.yaml b/projects/log4j2/project.yaml
index 23dbca22ac80..faec8f41b7ed 100644
--- a/projects/log4j2/project.yaml
+++ b/projects/log4j2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://logging.apache.org/log4j/2.x"
 main_repo: "https://github.com/apache/logging-log4j2"
 language: jvm
diff --git a/projects/logback/Dockerfile b/projects/logback/Dockerfile
index 91e4ff625570..ea7bc84294da 100644
--- a/projects/logback/Dockerfile
+++ b/projects/logback/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
 unzip maven.zip -d $SRC/maven && \
diff --git a/projects/logback/project.yaml b/projects/logback/project.yaml
index fdeac61ae743..ed5945f75310 100644
--- a/projects/logback/project.yaml
+++ b/projects/logback/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/qos-ch/logback"
 language: jvm
 primary_contact: "dev.qos.ch@gmail.com"
diff --git a/projects/loki/Dockerfile b/projects/loki/Dockerfile
index b045f7972b49..2ba057a7c85d 100644
--- a/projects/loki/Dockerfile
+++ b/projects/loki/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/grafana/loki/
 COPY build.sh $SRC/
 WORKDIR $SRC/loki
diff --git a/projects/loki/project.yaml b/projects/loki/project.yaml
index 5b75286283e7..f5d312d4e60a 100644
--- a/projects/loki/project.yaml
+++ b/projects/loki/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/grafana/loki"
 primary_contact: "cyril.tovena@grafana.com"
 auto_ccs :
diff --git a/projects/looker-sdk/Dockerfile b/projects/looker-sdk/Dockerfile
index aeb40826607e..57522f00da72 100644
--- a/projects/looker-sdk/Dockerfile
+++ b/projects/looker-sdk/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN pip3 install --upgrade pip && pip3 install mock
 RUN git clone --depth 1 https://github.com/looker-open-source/sdk-codegen
diff --git a/projects/looker-sdk/project.yaml b/projects/looker-sdk/project.yaml
index b8a720246811..5d38dc305046 100644
--- a/projects/looker-sdk/project.yaml
+++ b/projects/looker-sdk/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/looker-open-source/sdk-codegen
diff --git a/projects/lotus/Dockerfile b/projects/lotus/Dockerfile
index bdbee4371360..a2122937e5ef 100644
--- a/projects/lotus/Dockerfile
+++ b/projects/lotus/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN apt-get update && apt-get install -y mesa-opencl-icd ocl-icd-opencl-dev gcc \
     git bzr jq pkg-config curl clang build-essential hwloc libhwloc-dev
 RUN git clone --depth 1 https://github.com/filecoin-project/lotus
diff --git a/projects/lotus/project.yaml b/projects/lotus/project.yaml
index 8f3b76584b7b..0cce37e12065 100644
--- a/projects/lotus/project.yaml
+++ b/projects/lotus/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/filecoin-project/lotus"
 main_repo: "https://github.com/filecoin-project/lotus"
 primary_contact: "security@filecoin.org"
diff --git a/projects/lua/Dockerfile b/projects/lua/Dockerfile
index 9fcd066af67b..c2892e28e5d6 100644
--- a/projects/lua/Dockerfile
+++ b/projects/lua/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone https://github.com/ligurio/lua-c-api-tests testdir
 WORKDIR testdir
 RUN git clone --depth 1 --jobs $(nproc) https://github.com/ligurio/lua-c-api-corpus corpus_dir
diff --git a/projects/lua/project.yaml b/projects/lua/project.yaml
index f004feb3d07c..aeba15300e78 100644
--- a/projects/lua/project.yaml
+++ b/projects/lua/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.lua.org/"
 language: c
 primary_contact: "roberto@inf.puc-rio.br"
diff --git a/projects/lucene/Dockerfile b/projects/lucene/Dockerfile
index a04dc2beed9e..4786756889e5 100644
--- a/projects/lucene/Dockerfile
+++ b/projects/lucene/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN apt update && apt install -y openjdk-17-jdk
 
diff --git a/projects/lucene/project.yaml b/projects/lucene/project.yaml
index 76f7238c1d63..73a660b4a7ac 100644
--- a/projects/lucene/project.yaml
+++ b/projects/lucene/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://lucene.apache.org/"
 language: jvm
 main_repo: "https://github.com/apache/lucene"
diff --git a/projects/lxc/Dockerfile b/projects/lxc/Dockerfile
index fa61710eafb9..4c8fa723f49a 100644
--- a/projects/lxc/Dockerfile
+++ b/projects/lxc/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/lxc/lxc
 WORKDIR lxc
 COPY build.sh $SRC/
diff --git a/projects/lxc/project.yaml b/projects/lxc/project.yaml
index 69820302eab1..805564d5b55e 100644
--- a/projects/lxc/project.yaml
+++ b/projects/lxc/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/lxc/lxc"
 language: c
 primary_contact: "christian@brauner.io"
diff --git a/projects/lxml/Dockerfile b/projects/lxml/Dockerfile
index 0e61ddd2e572..6d651027a8dd 100644
--- a/projects/lxml/Dockerfile
+++ b/projects/lxml/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/lxml/lxml $SRC/lxml
 RUN apt-get update && apt-get install -y zlib1g-dev make autoconf automake libtool pkg-config rsync
 RUN python3 -m pip install --upgrade pip \
diff --git a/projects/lxml/project.yaml b/projects/lxml/project.yaml
index e1329e59395b..bde4b32e0096 100644
--- a/projects/lxml/project.yaml
+++ b/projects/lxml/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://lxml.de/
diff --git a/projects/lz4/Dockerfile b/projects/lz4/Dockerfile
index 0521e47c222a..a46ac439111d 100644
--- a/projects/lz4/Dockerfile
+++ b/projects/lz4/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/lz4/lz4.git /src/lz4
 
diff --git a/projects/lz4/project.yaml b/projects/lz4/project.yaml
index 3dfe3f3485fe..45039df90128 100644
--- a/projects/lz4/project.yaml
+++ b/projects/lz4/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/lz4/lz4"
 language: c++
 primary_contact: "Yann.collet.73@gmail.com"
diff --git a/projects/lz4_flex/Dockerfile b/projects/lz4_flex/Dockerfile
index f1c7c0354cec..763b297ee210 100644
--- a/projects/lz4_flex/Dockerfile
+++ b/projects/lz4_flex/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/PSeitz/lz4_flex lz4_flex
 WORKDIR $SRC
diff --git a/projects/lz4_flex/project.yaml b/projects/lz4_flex/project.yaml
index 012462db74bd..552cd5f846a6 100644
--- a/projects/lz4_flex/project.yaml
+++ b/projects/lz4_flex/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/PSeitz/lz4_flex"
 main_repo: "https://github.com/PSeitz/lz4_flex.git"
 language: rust
diff --git a/projects/lzma/Dockerfile b/projects/lzma/Dockerfile
index 575fe4a5eab7..964f1e052492 100644
--- a/projects/lzma/Dockerfile
+++ b/projects/lzma/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 
 RUN apt-get update && apt-get install -y \
diff --git a/projects/lzma/project.yaml b/projects/lzma/project.yaml
index da4250cf7bbd..32d58c14ef64 100644
--- a/projects/lzma/project.yaml
+++ b/projects/lzma/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.7-zip.org/sdk.html"
 main_repo: 'https://github.com/fancycode/lzma-fuzz.git'
 language: c++
diff --git a/projects/lzo/Dockerfile b/projects/lzo/Dockerfile
index 32127b11f158..967231efa28b 100644
--- a/projects/lzo/Dockerfile
+++ b/projects/lzo/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget
 RUN wget -O lzo.tar.gz \
     http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
diff --git a/projects/lzo/project.yaml b/projects/lzo/project.yaml
index 5713379b3a46..64cb837aa475 100644
--- a/projects/lzo/project.yaml
+++ b/projects/lzo/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.oberhumer.com"
 language: c++
 primary_contact: "info@oberhumer.com"
diff --git a/projects/magic-enum/Dockerfile b/projects/magic-enum/Dockerfile
index 35140d540528..53b7f933def7 100644
--- a/projects/magic-enum/Dockerfile
+++ b/projects/magic-enum/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone https://github.com/Neargye/magic_enum
 COPY build.sh *_fuzzer.cc $SRC/
 WORKDIR $SRC/magic_enum
diff --git a/projects/magic-enum/project.yaml b/projects/magic-enum/project.yaml
index 9ce0125f5834..dce3d0385b35 100644
--- a/projects/magic-enum/project.yaml
+++ b/projects/magic-enum/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/Neargye/magic_enum"
 language: c++
 main_repo: "https://github.com/Neargye/magic_enum.git"
diff --git a/projects/mako/Dockerfile b/projects/mako/Dockerfile
index abe10a39879f..4678c3b99a95 100644
--- a/projects/mako/Dockerfile
+++ b/projects/mako/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/sqlalchemy/mako
 WORKDIR mako
diff --git a/projects/mako/project.yaml b/projects/mako/project.yaml
index ec21dc413885..a0d2164246fb 100644
--- a/projects/mako/project.yaml
+++ b/projects/mako/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/sqlalchemy/mako
diff --git a/projects/mapserver/Dockerfile b/projects/mapserver/Dockerfile
index aca7b5776874..59e304bee398 100644
--- a/projects/mapserver/Dockerfile
+++ b/projects/mapserver/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y cmake zlib1g-dev libpng-dev libjpeg-dev libfreetype-dev libproj-dev libxml2-dev
 RUN git clone --depth 1 https://github.com/OSGeo/gdal
 RUN git clone --depth 1 https://github.com/MapServer/MapServer
diff --git a/projects/mapserver/project.yaml b/projects/mapserver/project.yaml
index 0e387772a080..8e29b7fec979 100644
--- a/projects/mapserver/project.yaml
+++ b/projects/mapserver/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://mapserver.org"
 language: c++
 primary_contact: "mapserver-security@osgeo.org"
diff --git a/projects/mariadb/Dockerfile b/projects/mariadb/Dockerfile
index e96f738deae2..8d68850518d0 100644
--- a/projects/mariadb/Dockerfile
+++ b/projects/mariadb/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get install -y build-essential libncurses5-dev gnutls-dev bison zlib1g-dev ccache
 RUN git clone --depth=1 https://github.com/MariaDB/server
 WORKDIR server
diff --git a/projects/mariadb/project.yaml b/projects/mariadb/project.yaml
index 5c56b0d1c865..f1645f3be2bd 100644
--- a/projects/mariadb/project.yaml
+++ b/projects/mariadb/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://mariadb.org/"
 main_repo: 'https://github.com/MariaDB/server'
 language: c++
diff --git a/projects/markdown-it-py/Dockerfile b/projects/markdown-it-py/Dockerfile
index 0d98bc942ca8..02e1df5121c0 100644
--- a/projects/markdown-it-py/Dockerfile
+++ b/projects/markdown-it-py/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/executablebooks/markdown-it-py markdown-it-py
 COPY *.sh $SRC/
 WORKDIR $SRC/markdown-it-py
diff --git a/projects/markdown-it-py/project.yaml b/projects/markdown-it-py/project.yaml
index 5122e907e54a..52e428efeb32 100644
--- a/projects/markdown-it-py/project.yaml
+++ b/projects/markdown-it-py/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/executablebooks/markdown-it-py
 main_repo: https://github.com/executablebooks/markdown-it-py
 primary_contact: "sewelljohnchris@gmail.com"
diff --git a/projects/markupsafe/Dockerfile b/projects/markupsafe/Dockerfile
index 3b7038c2d6e9..41118dd5fe35 100644
--- a/projects/markupsafe/Dockerfile
+++ b/projects/markupsafe/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/pallets/markupsafe markupsafe
 RUN python3 -m pip install --upgrade pip
 COPY *.sh *py $SRC/
diff --git a/projects/markupsafe/project.yaml b/projects/markupsafe/project.yaml
index 397be9c7f397..f1c4d5b9839a 100644
--- a/projects/markupsafe/project.yaml
+++ b/projects/markupsafe/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/pallets/markupsafe
diff --git a/projects/matio/Dockerfile b/projects/matio/Dockerfile
index acdc3cce023c..2564e21068c2 100644
--- a/projects/matio/Dockerfile
+++ b/projects/matio/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool-bin
 RUN git clone --depth 1 https://github.com/madler/zlib
 RUN git clone --depth 1 https://github.com/tbeu/matio.git matio
diff --git a/projects/matio/project.yaml b/projects/matio/project.yaml
index 2e49da86ff66..fc3c365c7841 100644
--- a/projects/matio/project.yaml
+++ b/projects/matio/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/tbeu/matio"
 language: c++
 primary_contact: "t-beu@users.sourceforge.net"
diff --git a/projects/maven-model/Dockerfile b/projects/maven-model/Dockerfile
index 9d6d1a330602..ed46f6a3d49e 100644
--- a/projects/maven-model/Dockerfile
+++ b/projects/maven-model/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip -o maven.zip && \
diff --git a/projects/maven-model/project.yaml b/projects/maven-model/project.yaml
index 743efeb4c21d..0bdd4fd18004 100644
--- a/projects/maven-model/project.yaml
+++ b/projects/maven-model/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/apache/maven"
 language: jvm
 primary_contact: "irali@google.com"
diff --git a/projects/maven/Dockerfile b/projects/maven/Dockerfile
index dc792b297187..0280f47e8382 100644
--- a/projects/maven/Dockerfile
+++ b/projects/maven/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.zip -o maven.zip && \
 unzip maven.zip -d $SRC/maven-3.8.8 && \
diff --git a/projects/maven/project.yaml b/projects/maven/project.yaml
index 3ad38ec75b81..ca8224c40d56 100644
--- a/projects/maven/project.yaml
+++ b/projects/maven/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://maven.apache.org/"
 language: jvm
 main_repo: "https://github.com/apache/maven.git"
diff --git a/projects/mbedtls/Dockerfile b/projects/mbedtls/Dockerfile
index 651ff34cea48..7c17bfc57822 100644
--- a/projects/mbedtls/Dockerfile
+++ b/projects/mbedtls/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make cmake
 RUN apt-get update && apt-get install -y \
     python-all-dev \
diff --git a/projects/mbedtls/project.yaml b/projects/mbedtls/project.yaml
index 96e83ed4c318..da1068038afb 100644
--- a/projects/mbedtls/project.yaml
+++ b/projects/mbedtls/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://developer.trustedfirmware.org/w/mbed-tls/"
 language: c++
 primary_contact: "mbed-tls-security@lists.trustedfirmware.org"
diff --git a/projects/mccabe/Dockerfile b/projects/mccabe/Dockerfile
index a3a25bd30cf5..3212f4d46d6f 100644
--- a/projects/mccabe/Dockerfile
+++ b/projects/mccabe/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ##########################################################################
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN pip3 install --upgrade pip
 RUN git clone https://github.com/pycqa/mccabe mccabe
 COPY *.sh *py $SRC/
diff --git a/projects/mccabe/project.yaml b/projects/mccabe/project.yaml
index eda9198d7087..deac43949041 100644
--- a/projects/mccabe/project.yaml
+++ b/projects/mccabe/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/pycqa/mccabe
 main_repo: https://github.com/pycqa/mccabe
 language: python
diff --git a/projects/md4c/Dockerfile b/projects/md4c/Dockerfile
index ad4c271d8e89..ae1e4dd8e4de 100755
--- a/projects/md4c/Dockerfile
+++ b/projects/md4c/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make cmake
 RUN git clone https://github.com/mity/md4c
 
diff --git a/projects/md4c/project.yaml b/projects/md4c/project.yaml
index 0654b36cafe3..8d9853b9a340 100755
--- a/projects/md4c/project.yaml
+++ b/projects/md4c/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mity/md4c"
 main_repo: "https://github.com/mity/md4c"
 primary_contact: "mity.ossfuzz@gmail.com"
diff --git a/projects/mdbook-i18n-helpers/Dockerfile b/projects/mdbook-i18n-helpers/Dockerfile
index 6fda76fd1e7b..519c1bfeaf66 100644
--- a/projects/mdbook-i18n-helpers/Dockerfile
+++ b/projects/mdbook-i18n-helpers/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/google/mdbook-i18n-helpers.git
 
diff --git a/projects/mdbook-i18n-helpers/project.yaml b/projects/mdbook-i18n-helpers/project.yaml
index ba05bd9215b3..efc16ec4a49d 100644
--- a/projects/mdbook-i18n-helpers/project.yaml
+++ b/projects/mdbook-i18n-helpers/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/google/mdbook-i18n-helpers"
 main_repo: "https://github.com/google/mdbook-i18n-helpers.git"
 language: rust
diff --git a/projects/mdbtools/Dockerfile b/projects/mdbtools/Dockerfile
index 37b26686a43b..627a17825826 100644
--- a/projects/mdbtools/Dockerfile
+++ b/projects/mdbtools/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf autoconf-archive automake gettext libtool pkg-config
 
 RUN git clone --depth 1 --branch master https://github.com/mdbtools/mdbtools mdbtools
diff --git a/projects/mdbtools/project.yaml b/projects/mdbtools/project.yaml
index e48308822bbf..f9ca88d3fd9d 100644
--- a/projects/mdbtools/project.yaml
+++ b/projects/mdbtools/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mdbtools/mdbtools"
 language: c
 primary_contact: "emmiller@gmail.com"
diff --git a/projects/mdit-py-plugins/Dockerfile b/projects/mdit-py-plugins/Dockerfile
index dfb2731126af..fd3c8c09d3af 100644
--- a/projects/mdit-py-plugins/Dockerfile
+++ b/projects/mdit-py-plugins/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN pip3 install --upgrade pip
 RUN git clone https://github.com/executablebooks/mdit-py-plugins mdit-py-plugins
 COPY *.sh *py $SRC/
diff --git a/projects/mdit-py-plugins/project.yaml b/projects/mdit-py-plugins/project.yaml
index ba7f79fbd249..0168f4424909 100644
--- a/projects/mdit-py-plugins/project.yaml
+++ b/projects/mdit-py-plugins/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/executablebooks/mdit-py-plugins
 main_repo: https://github.com/executablebooks/mdit-py-plugins
 language: python
diff --git a/projects/mdurl/Dockerfile b/projects/mdurl/Dockerfile
index 89ba704e693a..c198ffadd5b3 100644
--- a/projects/mdurl/Dockerfile
+++ b/projects/mdurl/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/executablebooks/mdurl mdurl
 COPY *.sh *py $SRC/
 WORKDIR $SRC/mdurl
diff --git a/projects/mdurl/project.yaml b/projects/mdurl/project.yaml
index eb8d370e3933..7df20cf15a85 100644
--- a/projects/mdurl/project.yaml
+++ b/projects/mdurl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/executablebooks/mdurl
 main_repo: https://github.com/executablebooks/mdurl
 language: python
diff --git a/projects/mercurial/Dockerfile b/projects/mercurial/Dockerfile
index 334d95d497a1..1e3abd69b856 100644
--- a/projects/mercurial/Dockerfile
+++ b/projects/mercurial/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y \
   autoconf \
   automake \
diff --git a/projects/mercurial/project.yaml b/projects/mercurial/project.yaml
index 1bfd0d421150..323f6dc04914 100644
--- a/projects/mercurial/project.yaml
+++ b/projects/mercurial/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.mercurial-scm.org/"
 language: c++
 primary_contact: "durin42@gmail.com"
diff --git a/projects/meshoptimizer/Dockerfile b/projects/meshoptimizer/Dockerfile
index 0522ab8a7aa1..e2f6aa842529 100644
--- a/projects/meshoptimizer/Dockerfile
+++ b/projects/meshoptimizer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool \
   pkg-config cmake libcurlpp-dev libcurl4-openssl-dev
 RUN git clone https://github.com/zeux/meshoptimizer
diff --git a/projects/meshoptimizer/project.yaml b/projects/meshoptimizer/project.yaml
index c4547c69889c..ce639fc4bcb1 100644
--- a/projects/meshoptimizer/project.yaml
+++ b/projects/meshoptimizer/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/zeux/meshoptimizer"
 main_repo: "https://github.com/zeux/meshoptimizer"
 language: c++
diff --git a/projects/metallb/Dockerfile b/projects/metallb/Dockerfile
index c30e31391a54..a4b60db90686 100644
--- a/projects/metallb/Dockerfile
+++ b/projects/metallb/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/metallb/metallb.git
 COPY build.sh $SRC/
 WORKDIR $SRC/metallb
diff --git a/projects/metallb/project.yaml b/projects/metallb/project.yaml
index 3d350279c724..0284c0cbfd52 100644
--- a/projects/metallb/project.yaml
+++ b/projects/metallb/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://metallb.universe.tf"
 language: go
 primary_contact: "fpaoline@redhat.com"
diff --git a/projects/micronaut/Dockerfile b/projects/micronaut/Dockerfile
index 2b08c96796e5..55adb8aa81f1 100644
--- a/projects/micronaut/Dockerfile
+++ b/projects/micronaut/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN apt-get update && apt-get install -y locales
 RUN locale-gen en_US.UTF-8
diff --git a/projects/micronaut/project.yaml b/projects/micronaut/project.yaml
index b5e1622d2691..9d48731e02e0 100644
--- a/projects/micronaut/project.yaml
+++ b/projects/micronaut/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://micronaut.io/"
 main_repo: "https://github.com/micronaut-projects/micronaut-core"
 language: jvm
diff --git a/projects/migtd/Dockerfile b/projects/migtd/Dockerfile
index adcde6e07f52..c78ab244669d 100644
--- a/projects/migtd/Dockerfile
+++ b/projects/migtd/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 # Install packages we need to build dependencies
 RUN apt-get update && \
     apt-get install -y \
diff --git a/projects/migtd/project.yaml b/projects/migtd/project.yaml
index 048f7e523045..5675281d0304 100644
--- a/projects/migtd/project.yaml
+++ b/projects/migtd/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/intel/MigTD"
 language: rust
 primary_contact: "wei3.liu@intel.com"
diff --git a/projects/minify/Dockerfile b/projects/minify/Dockerfile
index 20d75ad616df..ad1607bc08f7 100644
--- a/projects/minify/Dockerfile
+++ b/projects/minify/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/tdewolff/minify
 RUN git clone --depth 1 https://github.com/tdewolff/parse
 COPY build.sh $SRC/
diff --git a/projects/minify/project.yaml b/projects/minify/project.yaml
index 3854a4902b3c..1acc1edc281b 100644
--- a/projects/minify/project.yaml
+++ b/projects/minify/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/tdewolff/minify"
 primary_contact: "tacodewolff@gmail.com"
 auto_ccs :
diff --git a/projects/miniz/Dockerfile b/projects/miniz/Dockerfile
index 5658ff36a50b..567d8a108014 100644
--- a/projects/miniz/Dockerfile
+++ b/projects/miniz/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN apt-get update && \
     apt-get install -y cmake
diff --git a/projects/miniz/project.yaml b/projects/miniz/project.yaml
index c22ba57217b9..5115c3687ef2 100644
--- a/projects/miniz/project.yaml
+++ b/projects/miniz/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/richgel999/miniz"
 language: c
 primary_contact: "martin@urbackup.org"
diff --git a/projects/miniz_oxide/Dockerfile b/projects/miniz_oxide/Dockerfile
index e3b1ab7780c4..dec605906b9c 100644
--- a/projects/miniz_oxide/Dockerfile
+++ b/projects/miniz_oxide/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/Frommi/miniz_oxide miniz_oxide
 WORKDIR miniz_oxide
diff --git a/projects/miniz_oxide/project.yaml b/projects/miniz_oxide/project.yaml
index 01c2d07235ae..72a2c47554cf 100644
--- a/projects/miniz_oxide/project.yaml
+++ b/projects/miniz_oxide/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/Frommi/miniz_oxide"
 language: rust
 main_repo: "https://github.com/Frommi/miniz_oxide"
diff --git a/projects/minizip/Dockerfile b/projects/minizip/Dockerfile
index d2155e571544..8a1d0e8e973d 100644
--- a/projects/minizip/Dockerfile
+++ b/projects/minizip/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make cmake pkg-config libssl-dev:i386 \
     zlib1g-dev:i386 libbz2-dev:i386 liblzma-dev:i386 libzstd-dev:i386
 
diff --git a/projects/minizip/project.yaml b/projects/minizip/project.yaml
index 9eeed4df65a9..4a5950d3d81d 100644
--- a/projects/minizip/project.yaml
+++ b/projects/minizip/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/zlib-ng/minizip-ng"
 language: c++
 primary_contact: "nathan.moinvaziri@gmail.com"
diff --git a/projects/moby/Dockerfile b/projects/moby/Dockerfile
index b98894121408..5545648f9a0a 100644
--- a/projects/moby/Dockerfile
+++ b/projects/moby/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN apt-get update && apt-get install -y clang libbtrfs-dev pkg-config libdevmapper-dev
 RUN git clone --depth 1 https://github.com/moby/moby
 RUN git clone --depth 1 https://github.com/moby/go-archive
diff --git a/projects/moby/project.yaml b/projects/moby/project.yaml
index 4402810c0eb8..6321e5fa6420 100644
--- a/projects/moby/project.yaml
+++ b/projects/moby/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/moby/moby"
 language: go
 primary_contact: ""
diff --git a/projects/model-transparency/Dockerfile b/projects/model-transparency/Dockerfile
index ffe80e674c57..789cc79539a7 100644
--- a/projects/model-transparency/Dockerfile
+++ b/projects/model-transparency/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/sigstore/model-transparency
 WORKDIR model-transparency
diff --git a/projects/model-transparency/project.yaml b/projects/model-transparency/project.yaml
index c86a82551c67..e852e8bb0f79 100644
--- a/projects/model-transparency/project.yaml
+++ b/projects/model-transparency/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/sigstore/model-transparency
diff --git a/projects/monero/Dockerfile b/projects/monero/Dockerfile
index da3831ea49d2..38ae9ab97e96 100644
--- a/projects/monero/Dockerfile
+++ b/projects/monero/Dockerfile
@@ -17,7 +17,7 @@
 # Multistage docker build, requires docker 17.05
 
 # builder stage
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN set -ex && \
     apt-get update && \
diff --git a/projects/monero/project.yaml b/projects/monero/project.yaml
index d9acad56cd93..9c1bd9f4620c 100644
--- a/projects/monero/project.yaml
+++ b/projects/monero/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://getmonero.org/"
 language: c++
 primary_contact: "binaryfate01@gmail.com"
diff --git a/projects/mongo-go-driver/Dockerfile b/projects/mongo-go-driver/Dockerfile
index 1c073517f454..4022f2c856ea 100644
--- a/projects/mongo-go-driver/Dockerfile
+++ b/projects/mongo-go-driver/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 
diff --git a/projects/mongo-go-driver/project.yaml b/projects/mongo-go-driver/project.yaml
index 99998c5fcb79..b79010a494a5 100644
--- a/projects/mongo-go-driver/project.yaml
+++ b/projects/mongo-go-driver/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mongodb/mongo-go-driver"
 language: go
 main_repo: "https://github.com/mongodb/mongo-go-driver"
diff --git a/projects/mongoose/Dockerfile b/projects/mongoose/Dockerfile
index 906764ca04eb..1463734076b0 100644
--- a/projects/mongoose/Dockerfile
+++ b/projects/mongoose/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update 
 RUN git clone https://github.com/cesanta/mongoose
 WORKDIR $SRC
diff --git a/projects/mongoose/project.yaml b/projects/mongoose/project.yaml
index 94fc0778045f..b7784040f437 100644
--- a/projects/mongoose/project.yaml
+++ b/projects/mongoose/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/cesanta/mongoose"
 language: c++
 primary_contact: "info@cesanta.com"
diff --git a/projects/more-itertools/Dockerfile b/projects/more-itertools/Dockerfile
index c311aebc28f0..d5972f4eee5f 100644
--- a/projects/more-itertools/Dockerfile
+++ b/projects/more-itertools/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/more-itertools/more-itertools more-itertools
 COPY *.sh *py $SRC/
 WORKDIR $SRC/more-itertools
diff --git a/projects/more-itertools/project.yaml b/projects/more-itertools/project.yaml
index 742b43fdc15e..3ea7a5cba2ae 100644
--- a/projects/more-itertools/project.yaml
+++ b/projects/more-itertools/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/more-itertools/more-itertools
diff --git a/projects/mosh/Dockerfile b/projects/mosh/Dockerfile
index 7d73627902ab..c3102d7cc404 100644
--- a/projects/mosh/Dockerfile
+++ b/projects/mosh/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y autoconf automake protobuf-compiler \
     libprotobuf-dev pkg-config zlib1g-dev libncurses5-dev libssl-dev clang lcov
 RUN git clone --depth 1 https://github.com/mobile-shell/mosh.git
diff --git a/projects/mosh/project.yaml b/projects/mosh/project.yaml
index f0c47ed5bca9..d204dd7e5c66 100644
--- a/projects/mosh/project.yaml
+++ b/projects/mosh/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://mosh.org"
 primary_contact: "keithw@cs.stanford.edu"
 auto_ccs:
diff --git a/projects/mosquitto/Dockerfile b/projects/mosquitto/Dockerfile
index 70a601e0a3a6..ce7ad259086f 100644
--- a/projects/mosquitto/Dockerfile
+++ b/projects/mosquitto/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 # Main repo
 RUN git clone --depth 1 -b develop https://github.com/eclipse/mosquitto ${SRC}/mosquitto
diff --git a/projects/mosquitto/project.yaml b/projects/mosquitto/project.yaml
index a7d6272176df..cac074ac7f83 100644
--- a/projects/mosquitto/project.yaml
+++ b/projects/mosquitto/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://mosquitto.org/"
 language: c
 primary_contact: "roger@atchoo.org"
diff --git a/projects/mp4parse-rust/Dockerfile b/projects/mp4parse-rust/Dockerfile
index f974759f482a..164841d31b81 100644
--- a/projects/mp4parse-rust/Dockerfile
+++ b/projects/mp4parse-rust/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool curl cmake python llvm-dev libclang-dev clang
 
 RUN git clone --depth 1 --recursive https://github.com/mozilla/mp4parse-rust mp4parse-rust
diff --git a/projects/mp4parse-rust/project.yaml b/projects/mp4parse-rust/project.yaml
index 3eabf467b0db..1334541fa371 100644
--- a/projects/mp4parse-rust/project.yaml
+++ b/projects/mp4parse-rust/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mozilla/mp4parse-rust"
 primary_contact: "mgregan@mozilla.com"
 sanitizers:
diff --git a/projects/mp4san/Dockerfile b/projects/mp4san/Dockerfile
index 9970a397de66..96719fe628f2 100644
--- a/projects/mp4san/Dockerfile
+++ b/projects/mp4san/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/signalapp/mp4san mp4san
 WORKDIR mp4san
diff --git a/projects/mp4san/project.yaml b/projects/mp4san/project.yaml
index 424e6d2b4ca2..68e2ca74e04e 100644
--- a/projects/mp4san/project.yaml
+++ b/projects/mp4san/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/signalapp/mp4san"
 language: rust
 primary_contact: "usual.beach5937@jessacake.com"
diff --git a/projects/mpg123/Dockerfile b/projects/mpg123/Dockerfile
index 81a2ec6df3d0..68e9888a29dc 100644
--- a/projects/mpg123/Dockerfile
+++ b/projects/mpg123/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget \
   bzip2
 RUN wget https://www.mpg123.de/snapshot
diff --git a/projects/mpg123/project.yaml b/projects/mpg123/project.yaml
index c93bf5ff3cfc..8e744500446b 100644
--- a/projects/mpg123/project.yaml
+++ b/projects/mpg123/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.mpg123.de"
 language: c++
 primary_contact: "maintainer@mpg123.org"
diff --git a/projects/mpv/Dockerfile b/projects/mpv/Dockerfile
index f5e236be2ed7..95d4f9ef45d5 100644
--- a/projects/mpv/Dockerfile
+++ b/projects/mpv/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y nasm pkgconf gperf zip rsync && \
diff --git a/projects/mpv/project.yaml b/projects/mpv/project.yaml
index b5a6eb82794c..201c03715377 100644
--- a/projects/mpv/project.yaml
+++ b/projects/mpv/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mpv-player/mpv"
 main_repo: "https://github.com/mpv-player/mpv"
 language: c
diff --git a/projects/mrab-regex/Dockerfile b/projects/mrab-regex/Dockerfile
index 2b5f2a644f3d..2892230836ee 100644
--- a/projects/mrab-regex/Dockerfile
+++ b/projects/mrab-regex/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/mrabarnett/mrab-regex mrab-regex
 COPY *.sh *py $SRC/
 WORKDIR $SRC/mrab-regex
diff --git a/projects/mrab-regex/project.yaml b/projects/mrab-regex/project.yaml
index c022595b2319..c5d9086c21f8 100644
--- a/projects/mrab-regex/project.yaml
+++ b/projects/mrab-regex/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/mrabarnett/mrab-regex
diff --git a/projects/mruby/Dockerfile b/projects/mruby/Dockerfile
index 96236785e196..75854159a650 100644
--- a/projects/mruby/Dockerfile
+++ b/projects/mruby/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y build-essential ruby bison ninja-build \
     cmake zlib1g-dev libbz2-dev liblzma-dev
 RUN git clone --depth 1 https://github.com/mruby/mruby mruby
diff --git a/projects/mruby/project.yaml b/projects/mruby/project.yaml
index 5187fb1ccc8f..5ec7af5dab85 100644
--- a/projects/mruby/project.yaml
+++ b/projects/mruby/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://www.mruby.org/
 language: c++
 primary_contact: "yukihiro@gmail.com"
diff --git a/projects/msal/Dockerfile b/projects/msal/Dockerfile
index 65047ab5186b..411ba4ed6632 100644
--- a/projects/msal/Dockerfile
+++ b/projects/msal/Dockerfile
@@ -16,7 +16,7 @@
 # Held back because of github.com/google/oss-fuzz/pull/13407
 # Please fix the build failure + upgrade.
 
-FROM gcr.io/oss-fuzz-base/base-builder-python@sha256:d223a882810372830fd7968eb3e64533f3a2318c90be43ac753a46a15946faec
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04@sha256:d223a882810372830fd7968eb3e64533f3a2318c90be43ac753a46a15946faec
 RUN pip3 install --upgrade pip
 RUN git clone https://github.com/AzureAD/microsoft-authentication-library-for-python msal
 WORKDIR msal
diff --git a/projects/msal/project.yaml b/projects/msal/project.yaml
index 3a466603074e..4879023d47dd 100644
--- a/projects/msal/project.yaml
+++ b/projects/msal/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/AzureAD/microsoft-authentication-library-for-python
diff --git a/projects/msgpack-c/Dockerfile b/projects/msgpack-c/Dockerfile
index b346e06b671f..c3d146960b6f 100644
--- a/projects/msgpack-c/Dockerfile
+++ b/projects/msgpack-c/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y cmake wget bzip2
 RUN git clone --depth 1 --single-branch --branch cpp_master https://github.com/msgpack/msgpack-c.git msgpack-c
 
diff --git a/projects/msgpack-c/project.yaml b/projects/msgpack-c/project.yaml
index 3b367932d529..401c2832646e 100644
--- a/projects/msgpack-c/project.yaml
+++ b/projects/msgpack-c/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://msgpack.org/"
 language: c++
 primary_contact: "redboltz@gmail.com"
diff --git a/projects/msgpack-python/Dockerfile b/projects/msgpack-python/Dockerfile
index e5345ddf51d2..75e29eaf7918 100644
--- a/projects/msgpack-python/Dockerfile
+++ b/projects/msgpack-python/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/msgpack/msgpack-python msgpack-python
 RUN python3 -m pip install --upgrade pip \
     && python3 -m pip install -r $SRC/msgpack-python/requirements.txt
diff --git a/projects/msgpack-python/project.yaml b/projects/msgpack-python/project.yaml
index df82ab01ef13..05d10bab6198 100644
--- a/projects/msgpack-python/project.yaml
+++ b/projects/msgpack-python/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/msgpack/msgpack-python
diff --git a/projects/msquic/Dockerfile b/projects/msquic/Dockerfile
index b1811ee0956f..38b5ae516031 100644
--- a/projects/msquic/Dockerfile
+++ b/projects/msquic/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb packages-microsoft-prod.deb
 RUN apt-get update && \
diff --git a/projects/msquic/project.yaml b/projects/msquic/project.yaml
index 9bd372734be2..136f1f0a09c6 100644
--- a/projects/msquic/project.yaml
+++ b/projects/msquic/project.yaml
@@ -1,15 +1,16 @@
-homepage: "https://github.com/microsoft/msquic"
-language: c
-primary_contact: "msquicinfra@microsoft.com"
-auto_ccs:
-  - "daikiaminaka@microsoft.com"
-  - "anrossi@microsoft.com"
-  - "maolson@microsoft.com"
-  - "huanyi@microsoft.com"
-  - "nibanks@microsoft.com"
-fuzzing_engines:
-  - libfuzzer
-sanitizers:
-  - address
-  - undefined
-main_repo: 'https://github.com/microsoft/msquic.git'
+base_os_version: ubuntu-24-04
+homepage: "https://github.com/microsoft/msquic"
+language: c
+primary_contact: "msquicinfra@microsoft.com"
+auto_ccs:
+  - "daikiaminaka@microsoft.com"
+  - "anrossi@microsoft.com"
+  - "maolson@microsoft.com"
+  - "huanyi@microsoft.com"
+  - "nibanks@microsoft.com"
+fuzzing_engines:
+  - libfuzzer
+sanitizers:
+  - address
+  - undefined
+main_repo: 'https://github.com/microsoft/msquic.git'
diff --git a/projects/mtail/Dockerfile b/projects/mtail/Dockerfile
index b61263a5c969..e2350841ae8c 100644
--- a/projects/mtail/Dockerfile
+++ b/projects/mtail/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/google/mtail $GOPATH/src/github.com/google/mtail
 WORKDIR $GOPATH/src/github.com/google/mtail
 COPY build.sh $SRC/
diff --git a/projects/mtail/project.yaml b/projects/mtail/project.yaml
index 78ecc91ff697..f0235bbbf3ea 100644
--- a/projects/mtail/project.yaml
+++ b/projects/mtail/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/google/mtail
 primary_contact: jaq@spacepants.org
 fuzzing_engines:
diff --git a/projects/muduo/Dockerfile b/projects/muduo/Dockerfile
index d8ba22346e74..47424348f2c0 100644
--- a/projects/muduo/Dockerfile
+++ b/projects/muduo/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make libboost-dev
 RUN git clone --depth 1 https://github.com/chenshuo/muduo
 WORKDIR muduo
diff --git a/projects/muduo/project.yaml b/projects/muduo/project.yaml
index 3674a908dda9..d6eee62fc773 100644
--- a/projects/muduo/project.yaml
+++ b/projects/muduo/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/chenshuo/muduo"
 language: c++
 primary_contact: "chenshuo@chenshuo.com"
diff --git a/projects/multidict/Dockerfile b/projects/multidict/Dockerfile
index ef17ac1b03ab..9fd9883093f4 100644
--- a/projects/multidict/Dockerfile
+++ b/projects/multidict/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN pip3 install --upgrade pip
 RUN git clone https://github.com/aio-libs/multidict multidict
 COPY *.sh *py $SRC/
diff --git a/projects/multidict/project.yaml b/projects/multidict/project.yaml
index 3267b8bc938a..57474bdb89cc 100644
--- a/projects/multidict/project.yaml
+++ b/projects/multidict/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/aio-libs/multidict
 main_repo: https://github.com/aio-libs/multidict
 language: python
diff --git a/projects/multierr/Dockerfile b/projects/multierr/Dockerfile
index b740bf82a783..522c0a5b11a9 100644
--- a/projects/multierr/Dockerfile
+++ b/projects/multierr/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/uber-go/multierr
 WORKDIR $SRC/multierr
 COPY build.sh fuzz_test.go $SRC/
diff --git a/projects/multierr/project.yaml b/projects/multierr/project.yaml
index d12d053d1064..7cc6992b804c 100644
--- a/projects/multierr/project.yaml
+++ b/projects/multierr/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/uber-go/multierr"
 language: go
 main_repo: "https://github.com/uber-go/multierr"
diff --git a/projects/muparser/Dockerfile b/projects/muparser/Dockerfile
index 4be4373dc238..004e5026e923 100644
--- a/projects/muparser/Dockerfile
+++ b/projects/muparser/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN apt-get update && apt-get install -y build-essential cmake pkg-config
 RUN git clone --depth 1 https://github.com/beltoforion/muparser.git muparser
diff --git a/projects/muparser/project.yaml b/projects/muparser/project.yaml
index a4340f7f63cf..01c71bf373c6 100644
--- a/projects/muparser/project.yaml
+++ b/projects/muparser/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://beltoforion.de/article.php?a=muparser"
 language: c++
 primary_contact: "equinox.ib@googlemail.com"
diff --git a/projects/mupdf/Dockerfile b/projects/mupdf/Dockerfile
index 6395903d2bc8..e3a459ca29b7 100644
--- a/projects/mupdf/Dockerfile
+++ b/projects/mupdf/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make libtool pkg-config
 RUN git clone --recursive --depth 1 https://github.com/ArtifexSoftware/mupdf.git mupdf
 RUN git clone --depth 1 https://github.com/mozilla/pdf.js pdf.js && \
diff --git a/projects/mupdf/project.yaml b/projects/mupdf/project.yaml
index 70bb83258615..09b0b00c6ae7 100644
--- a/projects/mupdf/project.yaml
+++ b/projects/mupdf/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 main_repo: git://git.ghostscript.com/mupdf.git
 homepage: "https://www.mupdf.com"
 language: c++
diff --git a/projects/mutagen/Dockerfile b/projects/mutagen/Dockerfile
index 9a00311348d4..aed2edc0e49e 100644
--- a/projects/mutagen/Dockerfile
+++ b/projects/mutagen/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 
 RUN git clone \
 	--depth 1 \
diff --git a/projects/mutagen/project.yaml b/projects/mutagen/project.yaml
index 2f837db89728..22150d5209da 100644
--- a/projects/mutagen/project.yaml
+++ b/projects/mutagen/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://mutagen.readthedocs.io"
 main_repo: "https://github.com/quodlibet/mutagen"
 language: python
diff --git a/projects/mvel/Dockerfile b/projects/mvel/Dockerfile
index 35bb61beff03..f5021668b3f0 100644
--- a/projects/mvel/Dockerfile
+++ b/projects/mvel/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
diff --git a/projects/mvel/project.yaml b/projects/mvel/project.yaml
index da74bd83dfd3..ad02872fe36b 100644
--- a/projects/mvel/project.yaml
+++ b/projects/mvel/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mvel/mvel/"
 language: jvm
 fuzzing_engines:
diff --git a/projects/mxj/Dockerfile b/projects/mxj/Dockerfile
index e0e75a1547a1..279c7dee6267 100644
--- a/projects/mxj/Dockerfile
+++ b/projects/mxj/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/clbanning/mxj mxj
 RUN wget https://go.dev/dl/go1.24.6.linux-amd64.tar.gz \
diff --git a/projects/mxj/project.yaml b/projects/mxj/project.yaml
index 0783e3cc8f2d..daa9d54cc2f5 100644
--- a/projects/mxj/project.yaml
+++ b/projects/mxj/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/clbanning/mxj"
 language: go
 fuzzing_engines:
diff --git a/projects/myanmar-tools/Dockerfile b/projects/myanmar-tools/Dockerfile
index 62ed2157cba6..5f02ab929bb0 100644
--- a/projects/myanmar-tools/Dockerfile
+++ b/projects/myanmar-tools/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN apt-get update && apt-get -y install \
     build-essential \
diff --git a/projects/myanmar-tools/project.yaml b/projects/myanmar-tools/project.yaml
index a83c3e8d2bcf..7fda6c9e68b1 100644
--- a/projects/myanmar-tools/project.yaml
+++ b/projects/myanmar-tools/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/googlei18n/myanmar-tools/"
 language: c++
 primary_contact: "sffc@google.com"
diff --git a/projects/mybatis-3/Dockerfile b/projects/mybatis-3/Dockerfile
index 835b24467608..b643d5cf26b0 100644
--- a/projects/mybatis-3/Dockerfile
+++ b/projects/mybatis-3/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ##########################################################################
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
diff --git a/projects/mybatis-3/project.yaml b/projects/mybatis-3/project.yaml
index 956cfbaa47a2..05222d840498 100644
--- a/projects/mybatis-3/project.yaml
+++ b/projects/mybatis-3/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/mybatis/mybatis-3
 main_repo: https://github.com/mybatis/mybatis-3
 language: jvm
diff --git a/projects/mysql-connector-j/Dockerfile b/projects/mysql-connector-j/Dockerfile
index 018b2b27f429..9dad89fa6ce1 100644
--- a/projects/mysql-connector-j/Dockerfile
+++ b/projects/mysql-connector-j/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN curl -L https://dlcdn.apache.org//ant/binaries/apache-ant-1.10.12-bin.zip -o ant.zip && \
     unzip ant.zip -d $SRC/ant && \
diff --git a/projects/mysql-connector-j/project.yaml b/projects/mysql-connector-j/project.yaml
index f10bbd6ba9f2..c600746899c3 100644
--- a/projects/mysql-connector-j/project.yaml
+++ b/projects/mysql-connector-j/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://dev.mysql.com/doc/connector-j/8.0/en/"
 language: jvm
 main_repo: "https://github.com/mysql/mysql-connector-j"
diff --git a/projects/naga/Dockerfile b/projects/naga/Dockerfile
index e93d5e41eb89..27b04906b661 100644
--- a/projects/naga/Dockerfile
+++ b/projects/naga/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/gfx-rs/wgpu wgpu
 WORKDIR wgpu/naga
diff --git a/projects/naga/project.yaml b/projects/naga/project.yaml
index 234d3241f359..3d81eadc36ba 100644
--- a/projects/naga/project.yaml
+++ b/projects/naga/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/gfx-rs/naga"
 language: rust
 main_repo: "https://github.com/gfx-rs/naga"
diff --git a/projects/nanopb/Dockerfile b/projects/nanopb/Dockerfile
index 25637f7d2cd3..586f672df1bd 100644
--- a/projects/nanopb/Dockerfile
+++ b/projects/nanopb/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y python3-pip git wget
 RUN python3 -m pip install --upgrade pip
 RUN pip3 install protobuf grpcio-tools scons
diff --git a/projects/nanopb/project.yaml b/projects/nanopb/project.yaml
index dd9b932ebb75..0dc62fd623e0 100644
--- a/projects/nanopb/project.yaml
+++ b/projects/nanopb/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://jpa.kapsi.fi/nanopb/"
 language: c++
 primary_contact: "jpa@npb.mail.kapsi.fi"
diff --git a/projects/nats/Dockerfile b/projects/nats/Dockerfile
index e67288afc4f7..11d16c8a6e98 100644
--- a/projects/nats/Dockerfile
+++ b/projects/nats/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/nats-io/nats-server
 COPY build.sh $SRC/
 WORKDIR $SRC/nats-server
diff --git a/projects/nats/project.yaml b/projects/nats/project.yaml
index edc297524016..7c79aa8d5f1e 100644
--- a/projects/nats/project.yaml
+++ b/projects/nats/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/nats-io/nats-server"
 primary_contact: "security@nats.io"
 auto_ccs :
diff --git a/projects/nbformat/Dockerfile b/projects/nbformat/Dockerfile
index ed7f2cbefc9b..ce95305c18b6 100644
--- a/projects/nbformat/Dockerfile
+++ b/projects/nbformat/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN pip3 install --upgrade pip && pip3 install cython
 RUN git clone https://github.com/jupyter/nbformat nbformat
 COPY *.sh *py $SRC/
diff --git a/projects/nbformat/project.yaml b/projects/nbformat/project.yaml
index f79e2e462efb..3bcfc63e9e5d 100644
--- a/projects/nbformat/project.yaml
+++ b/projects/nbformat/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/jupyter/nbformat
 main_repo: https://github.com/jupyter/nbformat
 language: python
diff --git a/projects/nccl/Dockerfile b/projects/nccl/Dockerfile
index 4db3da4c7459..7c4d1b5e36a1 100644
--- a/projects/nccl/Dockerfile
+++ b/projects/nccl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 
 # Install CUDA
diff --git a/projects/nccl/project.yaml b/projects/nccl/project.yaml
index d291c3ab2b1a..4854046859ee 100644
--- a/projects/nccl/project.yaml
+++ b/projects/nccl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/NVIDIA/nccl"
 language: c++
 main_repo: "https://github.com/NVIDIA/nccl"
diff --git a/projects/ndpi/Dockerfile b/projects/ndpi/Dockerfile
index 25bf11d708f8..20d607aefb34 100644
--- a/projects/ndpi/Dockerfile
+++ b/projects/ndpi/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake autogen pkg-config libtool flex bison cmake libnuma-dev libpcre2-dev libjson-c-dev
 RUN git clone --depth 1 https://github.com/ntop/nDPI.git ndpi
 ADD https://www.tcpdump.org/release/libpcap-1.9.1.tar.gz libpcap-1.9.1.tar.gz
diff --git a/projects/ndpi/project.yaml b/projects/ndpi/project.yaml
index 3f6335a37b95..1e23f18ee6d1 100644
--- a/projects/ndpi/project.yaml
+++ b/projects/ndpi/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.ntop.org/products/deep-packet-inspection/ndpi/"
 language: c++
 primary_contact: "luca.deri@gmail.com"
diff --git a/projects/neqo/Dockerfile b/projects/neqo/Dockerfile
index e00a5d6aafcd..3da0f34bacfb 100644
--- a/projects/neqo/Dockerfile
+++ b/projects/neqo/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         libclang-dev gyp ninja-build python-is-python3 zlib1g-dev mercurial \
diff --git a/projects/neqo/project.yaml b/projects/neqo/project.yaml
index 038c47582e17..5e4796230e70 100644
--- a/projects/neqo/project.yaml
+++ b/projects/neqo/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mozilla/neqo"
 language: rust
 primary_contact: "necko@mozilla.com"
diff --git a/projects/nestegg/Dockerfile b/projects/nestegg/Dockerfile
index 189abba9717b..f4ec090c14a8 100644
--- a/projects/nestegg/Dockerfile
+++ b/projects/nestegg/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/kinetiknz/nestegg.git
 
 # clone libwebm for corpus data
diff --git a/projects/nestegg/project.yaml b/projects/nestegg/project.yaml
index ae4974628588..a04d2184c3c5 100644
--- a/projects/nestegg/project.yaml
+++ b/projects/nestegg/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/kinetiknz/nestegg"
 language: c++
 primary_contact: "mgregan@mozilla.com"
diff --git a/projects/net-snmp/Dockerfile b/projects/net-snmp/Dockerfile
index 903cdd021ef1..b35f26d585b4 100644
--- a/projects/net-snmp/Dockerfile
+++ b/projects/net-snmp/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone -q --depth 1 https://github.com/net-snmp/net-snmp net-snmp
 RUN net-snmp/ci/install.sh
 WORKDIR net-snmp
diff --git a/projects/net-snmp/project.yaml b/projects/net-snmp/project.yaml
index 7921811e620e..28177b330042 100644
--- a/projects/net-snmp/project.yaml
+++ b/projects/net-snmp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.net-snmp.org/"
 language: c++
 primary_contact: "hardaker@users.sourceforge.net"
diff --git a/projects/netaddr-py/Dockerfile b/projects/netaddr-py/Dockerfile
index 84682d34dd45..fb2782daa235 100644
--- a/projects/netaddr-py/Dockerfile
+++ b/projects/netaddr-py/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/netaddr/netaddr
 COPY build.sh *.py $SRC/
 WORKDIR netaddr
diff --git a/projects/netaddr-py/project.yaml b/projects/netaddr-py/project.yaml
index 643cca2e07b3..72a5464db78e 100644
--- a/projects/netaddr-py/project.yaml
+++ b/projects/netaddr-py/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/netaddr/netaddr
diff --git a/projects/netcdf/Dockerfile b/projects/netcdf/Dockerfile
index bb603efc41fc..d26b945e6183 100644
--- a/projects/netcdf/Dockerfile
+++ b/projects/netcdf/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y cmake m4 zlib1g-dev libcurlpp-dev libcurl4-openssl-dev
 RUN git clone --depth 1 https://github.com/Unidata/netcdf-c
 COPY build.sh $SRC
diff --git a/projects/netcdf/project.yaml b/projects/netcdf/project.yaml
index d81fcbe284f3..7e48d1486d46 100644
--- a/projects/netcdf/project.yaml
+++ b/projects/netcdf/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.unidata.ucar.edu/software/netcdf/docs/index.html"
 language: c++
 primary_contact: "wfisher@ucar.edu"
diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile
index 389cef37cbb4..f68c7c4faa9e 100644
--- a/projects/nettle/Dockerfile
+++ b/projects/nettle/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
 # ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-e701b6fa-f3a0-414e-ad6e-0223e6d42ebd.txt
 RUN apt-get update && apt-get install -y software-properties-common make autoconf build-essential wget lzip libtool python
 RUN git clone --depth 1 https://git.lysator.liu.se/nettle/nettle
diff --git a/projects/nettle/project.yaml b/projects/nettle/project.yaml
index a2ba3c4ddce6..6625ca540e20 100644
--- a/projects/nettle/project.yaml
+++ b/projects/nettle/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.lysator.liu.se/~nisse/nettle/"
 language: c++
 primary_contact: guidovranken@gmail.com
diff --git a/projects/netty/Dockerfile b/projects/netty/Dockerfile
index f0ad73349834..fbfbdf97ae3d 100644
--- a/projects/netty/Dockerfile
+++ b/projects/netty/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
 unzip maven.zip -d $SRC/maven-3.6.3 && \
diff --git a/projects/netty/project.yaml b/projects/netty/project.yaml
index e0d32373813e..8cfa9e3c6d38 100644
--- a/projects/netty/project.yaml
+++ b/projects/netty/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://netty.io/"
 language: jvm
 main_repo: "https://github.com/netty/netty.git"
diff --git a/projects/networkx/Dockerfile b/projects/networkx/Dockerfile
index 1dc7b5c6c58c..d30026b68286 100644
--- a/projects/networkx/Dockerfile
+++ b/projects/networkx/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 
 # Install necessary packages
 RUN apt-get update && \
diff --git a/projects/networkx/project.yaml b/projects/networkx/project.yaml
index 8cb950464b06..29942b37ef7a 100644
--- a/projects/networkx/project.yaml
+++ b/projects/networkx/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/networkx/networkx
diff --git a/projects/nfstream/Dockerfile b/projects/nfstream/Dockerfile
index a9f11f98fd84..33757c238075 100644
--- a/projects/nfstream/Dockerfile
+++ b/projects/nfstream/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update
 RUN apt-get install -y python3-dev autoconf automake libtool pkg-config flex bison gettext libjson-c-dev libpcap-dev
 RUN apt-get install -y libusb-1.0-0-dev libdbus-glib-1-dev libbluetooth-dev libnl-genl-3-dev libffi-dev python-dev
diff --git a/projects/nfstream/project.yaml b/projects/nfstream/project.yaml
index af863b6a683d..b1f8958de80b 100644
--- a/projects/nfstream/project.yaml
+++ b/projects/nfstream/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.nfstream.org/"
 language: python
 primary_contact: "aouinizied@gmail.com"
diff --git a/projects/nghttp2/Dockerfile b/projects/nghttp2/Dockerfile
index 106f656128aa..485f05347dff 100644
--- a/projects/nghttp2/Dockerfile
+++ b/projects/nghttp2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y \
   make \
   autoconf \
diff --git a/projects/nghttp2/project.yaml b/projects/nghttp2/project.yaml
index d9139573599d..3fadfecb3290 100644
--- a/projects/nghttp2/project.yaml
+++ b/projects/nghttp2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://nghttp2.org/"
 language: c++
 primary_contact: "tatsuhiro.t@gmail.com"
diff --git a/projects/nginx/Dockerfile b/projects/nginx/Dockerfile
index d567f2f5c489..547c32213b4a 100644
--- a/projects/nginx/Dockerfile
+++ b/projects/nginx/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN apt-get update && apt-get install -y libpcre3-dev zlib1g-dev mercurial ninja-build cmake liblzma-dev libz-dev binutils libtool
 RUN hg clone http://hg.nginx.org/nginx/
diff --git a/projects/nginx/project.yaml b/projects/nginx/project.yaml
index a15196401264..afee4f868573 100644
--- a/projects/nginx/project.yaml
+++ b/projects/nginx/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://nginx.org"
 main_repo: "https://github.com/nginx/nginx"
 language: c
diff --git a/projects/ngolo-fuzzing-x/Dockerfile b/projects/ngolo-fuzzing-x/Dockerfile
index 8e16742e332f..aafc3aba5b40 100644
--- a/projects/ngolo-fuzzing-x/Dockerfile
+++ b/projects/ngolo-fuzzing-x/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 
 RUN apt-get update && apt-get install -y protobuf-compiler libprotobuf-dev binutils cmake \
    ninja-build liblzma-dev libz-dev pkg-config autoconf libtool
diff --git a/projects/ngolo-fuzzing-x/project.yaml b/projects/ngolo-fuzzing-x/project.yaml
index 4f44f69314f9..c10f9466dc59 100644
--- a/projects/ngolo-fuzzing-x/project.yaml
+++ b/projects/ngolo-fuzzing-x/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "'https://github.com/catenacyber/ngolo-fuzzing"
 primary_contact: "p.antoine@catenacyber.fr"
 language: go