diff --git a/projects/ninja/Dockerfile b/projects/ninja/Dockerfile
index 28d3a96b337f..d838591fff5b 100644
--- a/projects/ninja/Dockerfile
+++ b/projects/ninja/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
 
 RUN git clone --depth 1 https://github.com/ninja-build/ninja
diff --git a/projects/ninja/project.yaml b/projects/ninja/project.yaml
index 2dbcc1103822..0d6afbb8d688 100644
--- a/projects/ninja/project.yaml
+++ b/projects/ninja/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ninja-build/ninja"
 language: c++
 primary_contact: "jhasse@gmail.com"
diff --git a/projects/njs/Dockerfile b/projects/njs/Dockerfile
index 00d975b7ebe6..5181eb26a7d6 100644
--- a/projects/njs/Dockerfile
+++ b/projects/njs/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 \
     mercurial git libpcre2-dev
 RUN hg clone http://hg.nginx.org/njs
diff --git a/projects/njs/project.yaml b/projects/njs/project.yaml
index 1b7f32479b00..61b0048b8e7e 100644
--- a/projects/njs/project.yaml
+++ b/projects/njs/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://nginx.org/en/docs/njs/"
 language: c++
 primary_contact: "xeioexception@gmail.com"
diff --git a/projects/node-xml2js/Dockerfile b/projects/node-xml2js/Dockerfile
index f4b75c6d93e8..2ec662225d22 100644
--- a/projects/node-xml2js/Dockerfile
+++ b/projects/node-xml2js/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/node-xml2js/project.yaml b/projects/node-xml2js/project.yaml
index 66323ce5fee8..253129668987 100644
--- a/projects/node-xml2js/project.yaml
+++ b/projects/node-xml2js/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/Leonidas-from-XIV/node-xml2js
 language: javascript
 main_repo: https://github.com/Leonidas-from-XIV/node-xml2js
diff --git a/projects/nodejs/Dockerfile b/projects/nodejs/Dockerfile
index dde3b4352f66..61fa69450b66 100644
--- a/projects/nodejs/Dockerfile
+++ b/projects/nodejs/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 flex bison build-essential
 RUN git clone --recursive --depth 1 https://github.com/nodejs/node
 RUN wget https://go.dev/dl/go1.24.5.linux-amd64.tar.gz \
diff --git a/projects/nodejs/project.yaml b/projects/nodejs/project.yaml
index 80d5063b7f9a..126919f45624 100644
--- a/projects/nodejs/project.yaml
+++ b/projects/nodejs/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://nodejs.org"
 primary_contact: "security@nodejs.org"
 language: c++
diff --git a/projects/nokogiri/Dockerfile b/projects/nokogiri/Dockerfile
index d68c927e476e..ba602d73dc42 100644
--- a/projects/nokogiri/Dockerfile
+++ b/projects/nokogiri/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 --no-install-recommends install -y build-essential make curl wget
 
 RUN git clone --depth=1 https://github.com/sparklemotion/nokogiri.git
diff --git a/projects/nokogiri/project.yaml b/projects/nokogiri/project.yaml
index 14bf3507db40..400a9f49b55b 100644
--- a/projects/nokogiri/project.yaml
+++ b/projects/nokogiri/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "nokogiri.org"
 language: c
 primary_contact: "mike.dalessio@gmail.com"
diff --git a/projects/nom/Dockerfile b/projects/nom/Dockerfile
index 793d785e1639..c87f2efcd8a6 100644
--- a/projects/nom/Dockerfile
+++ b/projects/nom/Dockerfile
@@ -13,7 +13,7 @@
 # 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/Geal/nom/
 WORKDIR $SRC
diff --git a/projects/nom/project.yaml b/projects/nom/project.yaml
index 9c2f7d84041e..fb9630d1115c 100644
--- a/projects/nom/project.yaml
+++ b/projects/nom/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/Geal/nom"
 main_repo: "https://github.com/Geal/nom"
 primary_contact: "geo.couprie@gmail.com"
diff --git a/projects/notary/Dockerfile b/projects/notary/Dockerfile
index 6ef0bcb29cc5..83e8996744d5 100644
--- a/projects/notary/Dockerfile
+++ b/projects/notary/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/notaryproject/notary
 RUN git clone --depth 1 https://github.com/notaryproject/notation-go
 RUN git clone --depth 1 https://github.com/cncf/cncf-fuzzing
diff --git a/projects/notary/project.yaml b/projects/notary/project.yaml
index fa9843bf6f57..a9a302fb72f1 100644
--- a/projects/notary/project.yaml
+++ b/projects/notary/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/notaryproject/notary"
 main_repo: "https://github.com/notaryproject"
 primary_contact: "yizha1@microsoft.com"
diff --git a/projects/nss/Dockerfile b/projects/nss/Dockerfile
index 77e9a6d7b8fb..1c166b577b36 100644
--- a/projects/nss/Dockerfile
+++ b/projects/nss/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 mercurial zlib1g-dev gyp ninja-build libssl-dev python libboost-dev libsqlite3-dev
 
diff --git a/projects/nss/project.yaml b/projects/nss/project.yaml
index 67b7b10dbbc0..257fd66ac3f4 100644
--- a/projects/nss/project.yaml
+++ b/projects/nss/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 language: c++
 primary_contact: "cryptoeng@mozilla.com"
diff --git a/projects/ntlm-auth/Dockerfile b/projects/ntlm-auth/Dockerfile
index f12f844231dd..7ff7fda0d993 100644
--- a/projects/ntlm-auth/Dockerfile
+++ b/projects/ntlm-auth/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/jborean93/ntlm-auth ntlm-auth
 COPY *.sh *py $SRC/
diff --git a/projects/ntlm-auth/project.yaml b/projects/ntlm-auth/project.yaml
index 9c87bc67e672..fe5c0741dca8 100644
--- a/projects/ntlm-auth/project.yaml
+++ b/projects/ntlm-auth/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/jborean93/ntlm-auth
 main_repo: https://github.com/jborean93/ntlm-auth
 language: python
diff --git a/projects/ntlm2/Dockerfile b/projects/ntlm2/Dockerfile
index 5aaea784bb24..13707aa6e927 100644
--- a/projects/ntlm2/Dockerfile
+++ b/projects/ntlm2/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/dopstar/requests-ntlm2
 WORKDIR requests-ntlm2
diff --git a/projects/ntlm2/project.yaml b/projects/ntlm2/project.yaml
index 76a235421142..a20d0578ff09 100644
--- a/projects/ntlm2/project.yaml
+++ b/projects/ntlm2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/dopstar/requests-ntlm2
diff --git a/projects/ntopng/Dockerfile b/projects/ntopng/Dockerfile
index f53d54fd1729..67d3c0baa3a4 100644
--- a/projects/ntopng/Dockerfile
+++ b/projects/ntopng/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 ninja-build \
     liblzma-dev libzstd-dev pkg-config libglib2.0-dev groff libxml2-dev \
     libcurl4-openssl-dev libsqlite3-dev flex bison
diff --git a/projects/ntopng/project.yaml b/projects/ntopng/project.yaml
index e1b64bdb2ad5..06beb0d91b11 100644
--- a/projects/ntopng/project.yaml
+++ b/projects/ntopng/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ntop/ntopng/"
 language: c++
 primary_contact: "luca.deri@gmail.com"
diff --git a/projects/ntp/Dockerfile b/projects/ntp/Dockerfile
index 45f1a18b0d73..4a53f283f1b4 100644
--- a/projects/ntp/Dockerfile
+++ b/projects/ntp/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 bison flex rsync lynx
 ADD https://www.bitkeeper.org/downloads/7.3.3/bk-7.3.3-x86_64-glibc213-linux.bin bk-7.3.3-x86_64-glibc213-linux.bin
 RUN chmod +x bk-7.3.3-x86_64-glibc213-linux.bin
diff --git a/projects/ntp/project.yaml b/projects/ntp/project.yaml
index 26d2dbc8e808..28d311c3d3c8 100644
--- a/projects/ntp/project.yaml
+++ b/projects/ntp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.ntp.org"
 language: c++
 primary_contact: "security@ntp.org"
diff --git a/projects/ntpsec/Dockerfile b/projects/ntpsec/Dockerfile
index 63b79ffd62e7..0e78becc70f3 100644
--- a/projects/ntpsec/Dockerfile
+++ b/projects/ntpsec/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 build-essential bison libssl-dev libcap-dev libseccomp-dev libavahi-compat-libdnssd-dev pps-tools python3-dev
 RUN git clone https://gitlab.com/NTPsec/ntpsec
 RUN git clone https://github.com/pkillarjun/oss-fuzz-bloat
diff --git a/projects/ntpsec/project.yaml b/projects/ntpsec/project.yaml
index 17402b5d13cc..540233db8941 100644
--- a/projects/ntpsec/project.yaml
+++ b/projects/ntpsec/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://ntpsec.org/"
 language: c
 primary_contact: "fallenpegasus@gmail.com"
diff --git a/projects/num-bigint/Dockerfile b/projects/num-bigint/Dockerfile
index 19e7eaba3b46..9ee38fd7d91a 100644
--- a/projects/num-bigint/Dockerfile
+++ b/projects/num-bigint/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 python
 RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz
 RUN git clone --depth 1 https://github.com/randombit/botan.git
diff --git a/projects/num-bigint/project.yaml b/projects/num-bigint/project.yaml
index bb6fb654a6f5..6857b91729da 100644
--- a/projects/num-bigint/project.yaml
+++ b/projects/num-bigint/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://crates.io/crates/num-bigint"
 language: c++
 primary_contact: "guidovranken@gmail.com"
diff --git a/projects/numactl/Dockerfile b/projects/numactl/Dockerfile
index 69e32f3f2851..63f35e194bd9 100644
--- a/projects/numactl/Dockerfile
+++ b/projects/numactl/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/numactl/numactl numactl
 WORKDIR numactl
diff --git a/projects/numactl/project.yaml b/projects/numactl/project.yaml
index 021dbecf7f58..1a96849cbcbd 100644
--- a/projects/numactl/project.yaml
+++ b/projects/numactl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/numactl/numactl"
 main_repo: "https://github.com/numactl/numactl"
 language: c
diff --git a/projects/numexpr/Dockerfile b/projects/numexpr/Dockerfile
index 0ee41741e6de..0579d3529056 100644
--- a/projects/numexpr/Dockerfile
+++ b/projects/numexpr/Dockerfile
@@ -15,7 +15,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 && pip3 install cython
 RUN git clone https://github.com/pydata/numexpr numexpr
 COPY *.sh *py $SRC/
diff --git a/projects/numexpr/project.yaml b/projects/numexpr/project.yaml
index 542e031ef180..d703000703fa 100644
--- a/projects/numexpr/project.yaml
+++ b/projects/numexpr/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/pydata/numexpr
 main_repo: https://github.com/pydata/numexpr
 language: python
diff --git a/projects/numpy/Dockerfile b/projects/numpy/Dockerfile
index be80a31f2eea..6b004f0a0390 100644
--- a/projects/numpy/Dockerfile
+++ b/projects/numpy/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
 # Numpy requires python3.11+
 RUN apt-get update && \
     apt-get install -y software-properties-common && \
diff --git a/projects/numpy/project.yaml b/projects/numpy/project.yaml
index 0dcdd83f2321..a0f9f2c8662a 100644
--- a/projects/numpy/project.yaml
+++ b/projects/numpy/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: numpy.org
diff --git a/projects/oak/Dockerfile b/projects/oak/Dockerfile
index 119a43d400a5..abfc6481e01c 100644
--- a/projects/oak/Dockerfile
+++ b/projects/oak/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 \
diff --git a/projects/oak/project.yaml b/projects/oak/project.yaml
index df7e69647399..88bb24944a84 100644
--- a/projects/oak/project.yaml
+++ b/projects/oak/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/project-oak/oak"
 language: rust
 primary_contact: "tzn@google.com"
diff --git a/projects/oatpp/Dockerfile b/projects/oatpp/Dockerfile
index 4b35f3a7cb9d..e1da2208c83c 100644
--- a/projects/oatpp/Dockerfile
+++ b/projects/oatpp/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/oatpp/oatpp.git oatpp 
 WORKDIR oatpp
diff --git a/projects/oatpp/project.yaml b/projects/oatpp/project.yaml
index 7d71c01bf867..00a14480197d 100644
--- a/projects/oatpp/project.yaml
+++ b/projects/oatpp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://oatpp.io/"
 language: c++
 primary_contact: "bugs@oatpp.io"
diff --git a/projects/oauth2/Dockerfile b/projects/oauth2/Dockerfile
index 31d84b1f1901..baa2ce4374d2 100644
--- a/projects/oauth2/Dockerfile
+++ b/projects/oauth2/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/googleapis/oauth2client oauth2
 WORKDIR oauth2
diff --git a/projects/oauth2/project.yaml b/projects/oauth2/project.yaml
index 50fe98fc70c3..00eb330e89cf 100644
--- a/projects/oauth2/project.yaml
+++ b/projects/oauth2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/googleapis/oauth2client
diff --git a/projects/oauthlib/Dockerfile b/projects/oauthlib/Dockerfile
index 751029bab27c..242eadc6f711 100644
--- a/projects/oauthlib/Dockerfile
+++ b/projects/oauthlib/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/oauthlib/oauthlib oauthlib
 RUN pip3 install --upgrade pip && pip3 install -r $SRC/oauthlib/requirements.txt
diff --git a/projects/oauthlib/project.yaml b/projects/oauthlib/project.yaml
index 498211004349..4e4027033859 100644
--- a/projects/oauthlib/project.yaml
+++ b/projects/oauthlib/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/oauthlib/oauthlib
diff --git a/projects/ogre/Dockerfile b/projects/ogre/Dockerfile
index 18e465907dde..4fbf2dda7151 100644
--- a/projects/ogre/Dockerfile
+++ b/projects/ogre/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 curl libgtest-dev libx11-dev
 RUN git clone --depth 1 https://github.com/OGRECave/ogre
 COPY build.sh *.cpp $SRC/
diff --git a/projects/ogre/project.yaml b/projects/ogre/project.yaml
index 6e9f4808e41e..9c3ec08811d2 100644
--- a/projects/ogre/project.yaml
+++ b/projects/ogre/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.ogre3d.org/"
 language: c++
 main_repo: "https://github.com/OGRECave/ogre"
diff --git a/projects/ohc/Dockerfile b/projects/ohc/Dockerfile
index 33aadd4c405a..0eff5785de65 100644
--- a/projects/ohc/Dockerfile
+++ b/projects/ohc/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
 
 ENV JAVA_HOME $JAVA_15_HOME
 ENV JVM_LD_LIBRARY_PATH $JAVA_HOME/lib/server
diff --git a/projects/ohc/project.yaml b/projects/ohc/project.yaml
index d3981bd6d3b8..89d993d034a4 100644
--- a/projects/ohc/project.yaml
+++ b/projects/ohc/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/snazy/ohc
 main_repo: https://github.com/snazy/ohc
 language: jvm
diff --git a/projects/okhttp/Dockerfile b/projects/okhttp/Dockerfile
index 46b4898bdb69..4e5bf8014602 100644
--- a/projects/okhttp/Dockerfile
+++ b/projects/okhttp/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/okhttp/project.yaml b/projects/okhttp/project.yaml
index 61fcea339258..0be259950aa8 100644
--- a/projects/okhttp/project.yaml
+++ b/projects/okhttp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://square.github.io/okhttp/"
 language: jvm
 main_repo: "https://github.com/square/okhttp.git"
diff --git a/projects/olefile/Dockerfile b/projects/olefile/Dockerfile
index eb8258103582..7564c394956a 100644
--- a/projects/olefile/Dockerfile
+++ b/projects/olefile/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/decalage2/olefile olefile
 WORKDIR olefile
diff --git a/projects/olefile/project.yaml b/projects/olefile/project.yaml
index f2821c822064..a7be45bc0876 100644
--- a/projects/olefile/project.yaml
+++ b/projects/olefile/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: http://www.decalage.info/olefile
diff --git a/projects/onednn/Dockerfile b/projects/onednn/Dockerfile
index 743129d3111b..bec6ca80d903 100644
--- a/projects/onednn/Dockerfile
+++ b/projects/onednn/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 libomp-dev libgomp1
 RUN git clone --depth 1 https://github.com/oneapi-src/oneDNN oneDNN
 WORKDIR oneDNN
diff --git a/projects/onednn/project.yaml b/projects/onednn/project.yaml
index 2778ccbc9e2e..3aae0cdaf176 100644
--- a/projects/onednn/project.yaml
+++ b/projects/onednn/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/uxlfoundation/oneDNN"
 main_repo: "https://github.com/uxlfoundation/oneDNN"
 language: c++
diff --git a/projects/open-json/Dockerfile b/projects/open-json/Dockerfile
index e457baa2f0f7..07f3bd6ccd32 100644
--- a/projects/open-json/Dockerfile
+++ b/projects/open-json/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.6.3/binaries/apache-maven-3.6.3-bin.zip \
       -o maven.zip && \
       unzip maven.zip -d $SRC/maven && \
diff --git a/projects/open-json/project.yaml b/projects/open-json/project.yaml
index 9c2328c78137..bf0400b617b0 100644
--- a/projects/open-json/project.yaml
+++ b/projects/open-json/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/tdunning/open-json
 main_repo: https://github.com/tdunning/open-json
 language: jvm
diff --git a/projects/open5gs/Dockerfile b/projects/open5gs/Dockerfile
index 9d4e567518d5..8eb278e70229 100644
--- a/projects/open5gs/Dockerfile
+++ b/projects/open5gs/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 upgrade -y && \
         DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/projects/open5gs/project.yaml b/projects/open5gs/project.yaml
index 538009f5446a..e6be93daeae6 100644
--- a/projects/open5gs/project.yaml
+++ b/projects/open5gs/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://open5gs.org"
 language: c
 primary_contact: "acetcom@gmail.com"
diff --git a/projects/openapi-schema-validator/Dockerfile b/projects/openapi-schema-validator/Dockerfile
index bee2d0caeba4..c488b707e556 100644
--- a/projects/openapi-schema-validator/Dockerfile
+++ b/projects/openapi-schema-validator/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 --depth=1 https://github.com/python-jsonschema/jsonschema-specifications jsonschema_specifications
 RUN git clone https://github.com/p1c2u/openapi-schema-validator openapi-schema-validator
diff --git a/projects/openapi-schema-validator/project.yaml b/projects/openapi-schema-validator/project.yaml
index e6dd754a7a74..d0bd89ffd270 100644
--- a/projects/openapi-schema-validator/project.yaml
+++ b/projects/openapi-schema-validator/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/p1c2u/openapi-schema-validator
 main_repo: https://github.com/p1c2u/openapi-schema-validator
 language: python
diff --git a/projects/openbabel/Dockerfile b/projects/openbabel/Dockerfile
index 0750dc62b767..21de86816830 100644
--- a/projects/openbabel/Dockerfile
+++ b/projects/openbabel/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 install -y cmake
 RUN git clone --depth 1 https://github.com/openbabel/openbabel.git
 COPY *.sh $SRC/
diff --git a/projects/openbabel/project.yaml b/projects/openbabel/project.yaml
index eea197135d1a..42971fe58637 100644
--- a/projects/openbabel/project.yaml
+++ b/projects/openbabel/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://openbabel.org"
 language: c++
 primary_contact: "geoff.hutchison@gmail.com"
diff --git a/projects/opencensus-cpp/Dockerfile b/projects/opencensus-cpp/Dockerfile
index 8a3248cd7756..8f7d4b28cb6e 100644
--- a/projects/opencensus-cpp/Dockerfile
+++ b/projects/opencensus-cpp/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/census-instrumentation/opencensus-cpp
 COPY WORKSPACE .bazelrc $SRC/
diff --git a/projects/opencensus-cpp/project.yaml b/projects/opencensus-cpp/project.yaml
index 7e612770a934..d238fc87ac14 100644
--- a/projects/opencensus-cpp/project.yaml
+++ b/projects/opencensus-cpp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opencensus.io/"
 language: c++
 primary_contact: "joshuasuereth@google.com"
diff --git a/projects/opencensus-go/Dockerfile b/projects/opencensus-go/Dockerfile
index ad5ee90840a5..071172662089 100644
--- a/projects/opencensus-go/Dockerfile
+++ b/projects/opencensus-go/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/census-instrumentation/opencensus-go
 COPY build.sh fuzz_test.go $SRC/
 WORKDIR $SRC/opencensus-go
diff --git a/projects/opencensus-go/project.yaml b/projects/opencensus-go/project.yaml
index ba71cdf3849d..82849ec690dd 100644
--- a/projects/opencensus-go/project.yaml
+++ b/projects/opencensus-go/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/census-instrumentation/opencensus-go"
 main_repo: "https://github.com/census-instrumentation/opencensus-go"
 auto_ccs :
diff --git a/projects/opencensus-java/Dockerfile b/projects/opencensus-java/Dockerfile
index 0f524876c870..4ea32338bb2a 100644
--- a/projects/opencensus-java/Dockerfile
+++ b/projects/opencensus-java/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/opencensus-java/project.yaml b/projects/opencensus-java/project.yaml
index fe9792a9b3ce..f333cec48c9d 100644
--- a/projects/opencensus-java/project.yaml
+++ b/projects/opencensus-java/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opencensus.io/"
 language: jvm
 fuzzing_engines:
diff --git a/projects/opencsv/Dockerfile b/projects/opencsv/Dockerfile
index 6650bfdc7fdd..0d6a6e283ac5 100644
--- a/projects/opencsv/Dockerfile
+++ b/projects/opencsv/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/opencsv/project.yaml b/projects/opencsv/project.yaml
index 9e401ccaf844..740a8b062996 100644
--- a/projects/opencsv/project.yaml
+++ b/projects/opencsv/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://sourceforge.net/projects/opencsv/"
 language: jvm
 fuzzing_engines:
diff --git a/projects/opencv/Dockerfile b/projects/opencv/Dockerfile
index a6b885df7adb..7eb279e29cf5 100644
--- a/projects/opencv/Dockerfile
+++ b/projects/opencv/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 cmake pkg-config
 RUN git clone --depth 1 https://github.com/opencv/opencv.git opencv
diff --git a/projects/opencv/project.yaml b/projects/opencv/project.yaml
index 31b7f6e7af74..e7f79be73d81 100644
--- a/projects/opencv/project.yaml
+++ b/projects/opencv/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opencv.org/"
 language: c++
 primary_contact: "garybradski@gmail.com"
diff --git a/projects/opendal/Dockerfile b/projects/opendal/Dockerfile
index 0411de35f6ff..fb320fa5930b 100644
--- a/projects/opendal/Dockerfile
+++ b/projects/opendal/Dockerfile
@@ -13,7 +13,7 @@
 # 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/apache/incubator-opendal.git opendal
 WORKDIR $SRC
diff --git a/projects/opendal/project.yaml b/projects/opendal/project.yaml
index 90e54f81c7b1..ca157dd58da9 100644
--- a/projects/opendal/project.yaml
+++ b/projects/opendal/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opendal.apache.org/"
 main_repo: "https://github.com/apache/incubator-opendal.git"
 language: rust
diff --git a/projects/opendnp3/Dockerfile b/projects/opendnp3/Dockerfile
index 2152ff060a7a..6fff0d9a49b1 100644
--- a/projects/opendnp3/Dockerfile
+++ b/projects/opendnp3/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 wget tshark
 
 RUN git clone --recursive -b release --depth 1 https://github.com/dnp3/opendnp3.git opendnp3
diff --git a/projects/opendnp3/project.yaml b/projects/opendnp3/project.yaml
index 891dc7ba67c8..12a8abcf976b 100644
--- a/projects/opendnp3/project.yaml
+++ b/projects/opendnp3/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.automatak.com/opendnp3/"
 language: c++
 primary_contact: "jadamcrain@gmail.com"
diff --git a/projects/openexr/Dockerfile b/projects/openexr/Dockerfile
index e64bb6660f14..cadffd87755d 100644
--- a/projects/openexr/Dockerfile
+++ b/projects/openexr/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 zlib1g-dev
 RUN git clone --depth 1 https://github.com/AcademySoftwareFoundation/openexr openexr
 WORKDIR openexr
diff --git a/projects/openexr/project.yaml b/projects/openexr/project.yaml
index 6f49b4327d17..22cb828f5391 100644
--- a/projects/openexr/project.yaml
+++ b/projects/openexr/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://openexr.com"
 language: c++
 primary_contact: "twodeecoda@gmail.com"
diff --git a/projects/openfga/Dockerfile b/projects/openfga/Dockerfile
index 70878e284a35..d2d044916000 100644
--- a/projects/openfga/Dockerfile
+++ b/projects/openfga/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/openfga/openfga
 RUN git clone --depth 1 https://github.com/cncf/cncf-fuzzing
 RUN git clone --depth 1 https://github.com/AdamKorcz/go-118-fuzz-build --branch=v2_2
diff --git a/projects/openfga/project.yaml b/projects/openfga/project.yaml
index 39a2597e0d32..11080991c9f7 100644
--- a/projects/openfga/project.yaml
+++ b/projects/openfga/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://openfga.dev"
 language: go
 primary_contact: "adam@adalogics.com"
diff --git a/projects/openh264/Dockerfile b/projects/openh264/Dockerfile
index c168d3b16d1c..17185d73d42c 100644
--- a/projects/openh264/Dockerfile
+++ b/projects/openh264/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 ffmpeg libstdc++-9-dev libstdc++-9-dev:i386 nasm subversion
 RUN git clone --depth 1 https://github.com/cisco/openh264.git openh264
diff --git a/projects/openh264/project.yaml b/projects/openh264/project.yaml
index 12e07df8b5ee..62ce81c8521d 100644
--- a/projects/openh264/project.yaml
+++ b/projects/openh264/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.openh264.org"
 language: c++
 primary_contact: "huili2@cisco.com"
diff --git a/projects/openjpeg/Dockerfile b/projects/openjpeg/Dockerfile
index 0c00a63afd66..92cafbe787f4 100644
--- a/projects/openjpeg/Dockerfile
+++ b/projects/openjpeg/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 g++ libtiff-dev
 RUN git clone --depth 1 https://github.com/uclouvain/openjpeg openjpeg
 # openjpeg-data is used to create a seed corpus
diff --git a/projects/openjpeg/project.yaml b/projects/openjpeg/project.yaml
index cc0b6be42829..a4860b710e02 100644
--- a/projects/openjpeg/project.yaml
+++ b/projects/openjpeg/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.openjpeg.org/"
 language: c++
 primary_contact: "antonin@gmail.com"
diff --git a/projects/openkruise/Dockerfile b/projects/openkruise/Dockerfile
index dbc2cef8938b..d618728a07ae 100644
--- a/projects/openkruise/Dockerfile
+++ b/projects/openkruise/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/openkruise/kruise
 COPY build.sh $SRC/
 WORKDIR $SRC/kruise
diff --git a/projects/openkruise/project.yaml b/projects/openkruise/project.yaml
index 7bd71583f6e2..7c8567eec621 100644
--- a/projects/openkruise/project.yaml
+++ b/projects/openkruise/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/openkruise/kruise"
 main_repo: "https://github.com/openkruise/kruise"
 primary_contact: "furykerry@gmail.com"
diff --git a/projects/opennavsurf-bag/Dockerfile b/projects/opennavsurf-bag/Dockerfile
index 149eddd6992c..b1b53c5aa27d 100644
--- a/projects/opennavsurf-bag/Dockerfile
+++ b/projects/opennavsurf-bag/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 pkg-config libtool cmake make autoconf automake ninja-build
 
diff --git a/projects/opennavsurf-bag/project.yaml b/projects/opennavsurf-bag/project.yaml
index 1e882b8a5383..a932abe50cf4 100644
--- a/projects/opennavsurf-bag/project.yaml
+++ b/projects/opennavsurf-bag/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/OpenNavigationSurface/BAG"
 language: c++
 primary_contact: "selimnairb@gmail.com"
diff --git a/projects/openpyxl/Dockerfile b/projects/openpyxl/Dockerfile
index e83f9c59b886..462e03e17c96 100644
--- a/projects/openpyxl/Dockerfile
+++ b/projects/openpyxl/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 install mercurial -y
 RUN pip3 install --upgrade pip
diff --git a/projects/openpyxl/project.yaml b/projects/openpyxl/project.yaml
index bc999eb4fa44..592ba2d2f395 100644
--- a/projects/openpyxl/project.yaml
+++ b/projects/openpyxl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://foss.heptapod.net/openpyxl/openpyxl
diff --git a/projects/opensc/Dockerfile b/projects/opensc/Dockerfile
index 7457e4e417c1..907c1db10203 100644
--- a/projects/opensc/Dockerfile
+++ b/projects/opensc/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 pcscd libccid libpcsclite-dev libssl-dev libreadline-dev autoconf automake build-essential docbook-xsl xsltproc libtool pkg-config zlib1g-dev help2man gengetopt
 RUN git clone --depth 1 --single-branch --branch master https://github.com/OpenSC/OpenSC opensc
 WORKDIR opensc
diff --git a/projects/opensc/project.yaml b/projects/opensc/project.yaml
index 9ebedae20ad4..8a56b28d556c 100644
--- a/projects/opensc/project.yaml
+++ b/projects/opensc/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/OpenSC/OpenSC/"
 language: c++
 primary_contact: "frankmorgner@gmail.com"
diff --git a/projects/opensips/Dockerfile b/projects/opensips/Dockerfile
index acc0e750ee46..6a89cd0f9aea 100755
--- a/projects/opensips/Dockerfile
+++ b/projects/opensips/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 bison flex libssl-dev pkg-config
 RUN git clone https://github.com/OpenSIPS/opensips
 
diff --git a/projects/opensips/project.yaml b/projects/opensips/project.yaml
index 51564cc5f7b8..c885ef19cfaa 100755
--- a/projects/opensips/project.yaml
+++ b/projects/opensips/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opensips.org/"
 main_repo: "https://github.com/OpenSIPS/opensips"
 primary_contact: "liviu@opensips.org"
diff --git a/projects/opensk/Dockerfile b/projects/opensk/Dockerfile
index b9b9810e26f3..2457c9a2fbd1 100644
--- a/projects/opensk/Dockerfile
+++ b/projects/opensk/Dockerfile
@@ -13,7 +13,7 @@
 # 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 -y make autoconf automake libtool curl \
     cmake python llvm-dev libclang-dev clang uuid-runtime pkg-config libssl-dev
 
diff --git a/projects/opensk/project.yaml b/projects/opensk/project.yaml
index dfdcb73c7d06..d4cd8455c3dd 100644
--- a/projects/opensk/project.yaml
+++ b/projects/opensk/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/google/OpenSK"
 main_repo: "https://github.com/google/OpenSK"
 primary_contact: "opensk@google.com"
diff --git a/projects/openssh/Dockerfile b/projects/openssh/Dockerfile
index e2cf2577441b..1aaf099c417e 100644
--- a/projects/openssh/Dockerfile
+++ b/projects/openssh/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 install -y libz-dev libssl1.1 libssl-dev libedit-dev zip
 RUN git clone --depth 1 https://github.com/openssh/openssh-portable openssh
diff --git a/projects/openssh/project.yaml b/projects/openssh/project.yaml
index c4e3a0d6e11a..f798ffdac2eb 100644
--- a/projects/openssh/project.yaml
+++ b/projects/openssh/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://www.openssh.com/
 language: c++
 primary_contact: "djm@mindrot.org"
diff --git a/projects/openssl/Dockerfile b/projects/openssl/Dockerfile
index a158b9e03646..292eabb1c785 100644
--- a/projects/openssl/Dockerfile
+++ b/projects/openssl/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
 RUN git clone --depth 1 https://github.com/openssl/openssl.git
 RUN cd $SRC/openssl/ && git submodule update --init fuzz/corpora
diff --git a/projects/openssl/project.yaml b/projects/openssl/project.yaml
index 9015d7a4bfcf..06b440661c16 100644
--- a/projects/openssl/project.yaml
+++ b/projects/openssl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.openssl.org/"
 language: c++
 primary_contact: "kurt@roeckx.be"
diff --git a/projects/opentelemetry-go-contrib/Dockerfile b/projects/opentelemetry-go-contrib/Dockerfile
index b3070189db24..70adb13ad56b 100644
--- a/projects/opentelemetry-go-contrib/Dockerfile
+++ b/projects/opentelemetry-go-contrib/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/open-telemetry/opentelemetry-go-contrib
 WORKDIR $SRC/opentelemetry-go-contrib
 COPY build.sh $SRC/
diff --git a/projects/opentelemetry-go-contrib/project.yaml b/projects/opentelemetry-go-contrib/project.yaml
index afd3d3e7f0f6..600b207fa4b0 100644
--- a/projects/opentelemetry-go-contrib/project.yaml
+++ b/projects/opentelemetry-go-contrib/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opentelemetry.io/"
 language: go
 primary_contact: "cncf-opentelemetry-tc@lists.cncf.io"
diff --git a/projects/opentelemetry-go/Dockerfile b/projects/opentelemetry-go/Dockerfile
index 826f53ab1dc9..ddac452dcfaa 100644
--- a/projects/opentelemetry-go/Dockerfile
+++ b/projects/opentelemetry-go/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/open-telemetry/opentelemetry-go
 WORKDIR $SRC/opentelemetry-go
 COPY build.sh $SRC/
diff --git a/projects/opentelemetry-go/project.yaml b/projects/opentelemetry-go/project.yaml
index 65a73aa18dd4..7220ed9c2fe4 100644
--- a/projects/opentelemetry-go/project.yaml
+++ b/projects/opentelemetry-go/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opentelemetry.io/"
 language: go
 primary_contact: "cncf-opentelemetry-tc@lists.cncf.io"
diff --git a/projects/opentelemetry/Dockerfile b/projects/opentelemetry/Dockerfile
index 5adb7f583199..da6d82d4af6b 100644
--- a/projects/opentelemetry/Dockerfile
+++ b/projects/opentelemetry/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/open-telemetry/opentelemetry-collector
 RUN git clone --depth=1 https://github.com/dvyukov/go-fuzz-corpus
 RUN git clone --depth 1 https://github.com/AdamKorcz/opentelemetry-collector-contrib --branch=fuzz
diff --git a/projects/opentelemetry/project.yaml b/projects/opentelemetry/project.yaml
index 77702582c0ef..3aae5fea731d 100644
--- a/projects/opentelemetry/project.yaml
+++ b/projects/opentelemetry/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opentelemetry.io/"
 language: go
 primary_contact: "cncf-opentelemetry-tc@lists.cncf.io"
diff --git a/projects/openthread/Dockerfile b/projects/openthread/Dockerfile
index 4ef0e6e4645f..1cb3acbf6a98 100644
--- a/projects/openthread/Dockerfile
+++ b/projects/openthread/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 ninja-build
 RUN git clone --depth 1 https://github.com/openthread/openthread
diff --git a/projects/openthread/project.yaml b/projects/openthread/project.yaml
index 4ebec167be42..bcaafb8d4542 100644
--- a/projects/openthread/project.yaml
+++ b/projects/openthread/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/openthread/openthread"
 language: c++
 primary_contact: "jonhui@google.com"
diff --git a/projects/openvpn/Dockerfile b/projects/openvpn/Dockerfile
index d9bb5ea493fe..2da624e3f402 100644
--- a/projects/openvpn/Dockerfile
+++ b/projects/openvpn/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 pkg-config make autoconf automake libtool libssl-dev liblzo2-dev libpam-dev libnl-3-dev libnl-genl-3-dev libcap-ng-dev
 
 RUN git clone --depth 1 https://github.com/google/boringssl.git boringssl
diff --git a/projects/openvpn/project.yaml b/projects/openvpn/project.yaml
index a897deca4d53..caf6dc40fe43 100644
--- a/projects/openvpn/project.yaml
+++ b/projects/openvpn/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://community.openvpn.net"
 language: c
 primary_contact: "arne@rfc2549.org"
diff --git a/projects/openvswitch/Dockerfile b/projects/openvswitch/Dockerfile
index 65a4ea463d24..cdfd5fe8aecb 100644
--- a/projects/openvswitch/Dockerfile
+++ b/projects/openvswitch/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 python python3-pip \
     libz-dev libssl-dev libssl1.1 wget
diff --git a/projects/openvswitch/project.yaml b/projects/openvswitch/project.yaml
index 47a38ee266bf..ecedde5e9dc9 100644
--- a/projects/openvswitch/project.yaml
+++ b/projects/openvswitch/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.openvswitch.org"
 language: c++
 primary_contact: "blp@ovn.org"
diff --git a/projects/openweave/Dockerfile b/projects/openweave/Dockerfile
index 2c940a4e707b..8a815d7dbcd8 100644
--- a/projects/openweave/Dockerfile
+++ b/projects/openweave/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 python-setuptools bridge-utils \
   libglib2.0-dev libdbus-1-dev libudev-dev \
   libical-dev libreadline-dev udev \
diff --git a/projects/openweave/project.yaml b/projects/openweave/project.yaml
index 93a53b0d7178..2ea1a741e654 100644
--- a/projects/openweave/project.yaml
+++ b/projects/openweave/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://openweave.io"
 language: c++
 primary_contact: "szewczyk@google.com"
diff --git a/projects/openyurt/Dockerfile b/projects/openyurt/Dockerfile
index 1d69ee1f1588..a2ba3556ba99 100644
--- a/projects/openyurt/Dockerfile
+++ b/projects/openyurt/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
 
 ENV PROJECT_ROOT="${GOPATH:-/root/go}/src/github.com/openyurtio"
 
diff --git a/projects/openyurt/project.yaml b/projects/openyurt/project.yaml
index 029fb4512b28..98acffcc8012 100644
--- a/projects/openyurt/project.yaml
+++ b/projects/openyurt/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://openyurt.io/"
 main_repo: "https://github.com/openyurtio/openyurt"
 primary_contact: "rambohe.ch@gmail.com"
diff --git a/projects/opt_einsum/Dockerfile b/projects/opt_einsum/Dockerfile
index 2885b9f01a33..3e00cc4c3668 100644
--- a/projects/opt_einsum/Dockerfile
+++ b/projects/opt_einsum/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 Cython numpy
 RUN git clone https://github.com/dgasmith/opt_einsum opt_einsum
 COPY *.sh *py $SRC/
diff --git a/projects/opt_einsum/project.yaml b/projects/opt_einsum/project.yaml
index fd6c92312ec9..0423438804b2 100644
--- a/projects/opt_einsum/project.yaml
+++ b/projects/opt_einsum/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/dgasmith/opt_einsum
diff --git a/projects/opus/Dockerfile b/projects/opus/Dockerfile
index c7ccdeccde48..5324ae2ee196 100644
--- a/projects/opus/Dockerfile
+++ b/projects/opus/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 git clone --single-branch --branch ossfuzz https://gitlab.xiph.org/xiph/opus.git
diff --git a/projects/opus/project.yaml b/projects/opus/project.yaml
index cc68cd2295a3..fdc1c31ca26b 100644
--- a/projects/opus/project.yaml
+++ b/projects/opus/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opus-codec.org/"
 language: c++
 primary_contact: "jmvalin@jmvalin.ca"
diff --git a/projects/opusfile/Dockerfile b/projects/opusfile/Dockerfile
index 452f30192891..1d907ee04eb8 100644
--- a/projects/opusfile/Dockerfile
+++ b/projects/opusfile/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 git libogg0 libogg-dev libopus0 libopus-dev libssl-dev libtool make pkg-config
 RUN git clone --depth 1 https://gitlab.xiph.org/xiph/opusfile
 WORKDIR opusfile
diff --git a/projects/opusfile/project.yaml b/projects/opusfile/project.yaml
index 6a3ff994909c..81cc5b754ac0 100644
--- a/projects/opusfile/project.yaml
+++ b/projects/opusfile/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opus-codec.org/"
 main_repo: "https://gitlab.xiph.org/xiph/opusfile.git"
 language: c
diff --git a/projects/oracle-py-cx/Dockerfile b/projects/oracle-py-cx/Dockerfile
index 8fd49ec6bf3c..f4145e3069c9 100644
--- a/projects/oracle-py-cx/Dockerfile
+++ b/projects/oracle-py-cx/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 mkdir -p /opt/oracle
 RUN cd /opt/oracle && \
     wget https://download.oracle.com/otn_software/linux/instantclient/216000/instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \
diff --git a/projects/oracle-py-cx/project.yaml b/projects/oracle-py-cx/project.yaml
index 6e74025a26c1..9f845aac51b1 100644
--- a/projects/oracle-py-cx/project.yaml
+++ b/projects/oracle-py-cx/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/oracle/python-cx_Oracle
diff --git a/projects/orjson/Dockerfile b/projects/orjson/Dockerfile
index 97c143b293b0..d36c64a35fc7 100644
--- a/projects/orjson/Dockerfile
+++ b/projects/orjson/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 python3 -m pip install --upgrade pip
diff --git a/projects/orjson/project.yaml b/projects/orjson/project.yaml
index 64dc08a55655..b23a9f8b0a22 100644
--- a/projects/orjson/project.yaml
+++ b/projects/orjson/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ijl/orjson"
 language: python
 fuzzing_engines:
diff --git a/projects/oscrypto/Dockerfile b/projects/oscrypto/Dockerfile
index 31e75add9dfe..e864eb6a812d 100644
--- a/projects/oscrypto/Dockerfile
+++ b/projects/oscrypto/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/wbond/oscrypto oscrypto
 COPY *.sh *py $SRC/
 WORKDIR $SRC/oscrypto
diff --git a/projects/oscrypto/project.yaml b/projects/oscrypto/project.yaml
index 3480961e2591..a3ff78200c11 100644
--- a/projects/oscrypto/project.yaml
+++ b/projects/oscrypto/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/wbond/oscrypto
diff --git a/projects/osgi/Dockerfile b/projects/osgi/Dockerfile
index df807a1d54b1..6e401649cbbb 100644
--- a/projects/osgi/Dockerfile
+++ b/projects/osgi/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
 
 WORKDIR ${SRC}
 #
diff --git a/projects/osgi/project.yaml b/projects/osgi/project.yaml
index 5a7007fedfeb..ae51f235650d 100644
--- a/projects/osgi/project.yaml
+++ b/projects/osgi/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://docs.osgi.org/"
 language: jvm
 main_repo: "https://github.com/osgi/osgi"
diff --git a/projects/osquery/Dockerfile b/projects/osquery/Dockerfile
index 74575f65cb1a..fa7802bfd1f9 100755
--- a/projects/osquery/Dockerfile
+++ b/projects/osquery/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:d34b94e3cf868e49d2928c76ddba41fd4154907a1a381b3a263fafffb7c3dce0
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04@sha256:d34b94e3cf868e49d2928c76ddba41fd4154907a1a381b3a263fafffb7c3dce0
 RUN apt-get update && apt-get install -y --no-install-recommends python python3 bison flex make wget xz-utils libunwind-dev lsb-release build-essential libssl-dev
 
 # osquery now needs at least version 3.21.4.
diff --git a/projects/osquery/project.yaml b/projects/osquery/project.yaml
index eb7b97082151..568a3bbdf841 100644
--- a/projects/osquery/project.yaml
+++ b/projects/osquery/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://osquery.io"
 language: c++
 primary_contact: "osquery@osquery.io"
diff --git a/projects/oss-fuzz-example/Dockerfile b/projects/oss-fuzz-example/Dockerfile
index bc39302ce7c3..73c7eba28717 100644
--- a/projects/oss-fuzz-example/Dockerfile
+++ b/projects/oss-fuzz-example/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 # Install the packages needed for building the project
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 
diff --git a/projects/oss-fuzz-example/project.yaml b/projects/oss-fuzz-example/project.yaml
index e77d4b9c2b95..54eac1880dc7 100644
--- a/projects/oss-fuzz-example/project.yaml
+++ b/projects/oss-fuzz-example/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/AdaLogics/oss-fuzz-example"
 language: c
 primary_contact: "david@adalogics.com"
diff --git a/projects/ostree/Dockerfile b/projects/ostree/Dockerfile
index 4ce61c701b0a..7eca3e31fbe9 100644
--- a/projects/ostree/Dockerfile
+++ b/projects/ostree/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 ARG glib_tag=2.78.4
 RUN apt-get update && apt-get install -y \
     make \
diff --git a/projects/ostree/project.yaml b/projects/ostree/project.yaml
index 8fc13746d74b..5947f5f9e451 100644
--- a/projects/ostree/project.yaml
+++ b/projects/ostree/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ostreedev/ostree"
 main_repo: 'https://github.com/ostreedev/ostree'
 language: c
diff --git a/projects/ots/Dockerfile b/projects/ots/Dockerfile
index 6ab4d8662398..f36870397030 100644
--- a/projects/ots/Dockerfile
+++ b/projects/ots/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 && \
     pip3 install meson==0.55.2 ninja
 RUN git clone --depth 1 https://github.com/khaledhosny/ots.git
diff --git a/projects/ots/project.yaml b/projects/ots/project.yaml
index b2d1d7677b61..d0ce7b48fbe1 100644
--- a/projects/ots/project.yaml
+++ b/projects/ots/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/khaledhosny/ots"
 language: c++
 primary_contact: "dr.khaled.hosny@gmail.com"
diff --git a/projects/ox-ruby/Dockerfile b/projects/ox-ruby/Dockerfile
index aa65f3764ba3..b91449fe3125 100644
--- a/projects/ox-ruby/Dockerfile
+++ b/projects/ox-ruby/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-ruby
+FROM gcr.io/oss-fuzz-base/base-builder-ruby:ubuntu-24-04
 
 RUN git clone --depth 1 --single-branch https://github.com/ohler55/ox.git $SRC/ox-ruby
 
diff --git a/projects/ox-ruby/project.yaml b/projects/ox-ruby/project.yaml
index c878713f086c..415cc4104e73 100644
--- a/projects/ox-ruby/project.yaml
+++ b/projects/ox-ruby/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ohler55/ox"
 language: ruby
 sanitizers:
diff --git a/projects/oxia/Dockerfile b/projects/oxia/Dockerfile
index a387802efb01..2229f757b2c8 100644
--- a/projects/oxia/Dockerfile
+++ b/projects/oxia/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/oxia-db/oxia
 RUN git clone --depth 1 https://github.com/AdamKorcz/cncf-fuzzing
 RUN git clone --depth 1 https://github.com/AdamKorcz/go-118-fuzz-build --branch=v2_2
diff --git a/projects/oxia/project.yaml b/projects/oxia/project.yaml
index d1c382a707ab..9a113e527bf4 100644
--- a/projects/oxia/project.yaml
+++ b/projects/oxia/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://oxia-db.github.io"
 language: go
 primary_contact: "mmerli@apache.org"
diff --git a/projects/p11-kit/Dockerfile b/projects/p11-kit/Dockerfile
index bd6302762077..4169286bf206 100644
--- a/projects/p11-kit/Dockerfile
+++ b/projects/p11-kit/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 libtasn1-6-dev libffi-dev gettext autopoint python3
 RUN git clone --depth 1 --recurse-submodules https://github.com/p11-glue/p11-kit.git p11-kit
 WORKDIR p11-kit
diff --git a/projects/p11-kit/project.yaml b/projects/p11-kit/project.yaml
index cc739b17b1b5..3c692c1e224b 100644
--- a/projects/p11-kit/project.yaml
+++ b/projects/p11-kit/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://p11-glue.github.io/p11-glue/p11-kit.html
 main_repo: https://github.com/p11-glue/p11-kit
 language: c
diff --git a/projects/p9/Dockerfile b/projects/p9/Dockerfile
index 574872fcaa20..d8442af872e5 100644
--- a/projects/p9/Dockerfile
+++ b/projects/p9/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
 MAINTAINER s@sevki.org
 
 RUN git clone --depth 1 https://github.com/hugelgupf/p9
diff --git a/projects/p9/project.yaml b/projects/p9/project.yaml
index bae55cbee39e..ba920595d45e 100644
--- a/projects/p9/project.yaml
+++ b/projects/p9/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/hugelgupf/p9"
 language: go
 primary_contact: "harvey@googlegroups.com"
diff --git a/projects/pacemaker/Dockerfile b/projects/pacemaker/Dockerfile
index ab7120c60ef2..37092277e9bd 100644
--- a/projects/pacemaker/Dockerfile
+++ b/projects/pacemaker/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 nasm autopoint gettext python3 libqb-dev libbz2-dev \
   libglib2.0-dev corosync libgnutls28-dev libcfg-dev libcpg-dev libcmap-dev \
diff --git a/projects/pacemaker/project.yaml b/projects/pacemaker/project.yaml
index 1b16adebccf5..e287bee9e03a 100644
--- a/projects/pacemaker/project.yaml
+++ b/projects/pacemaker/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.clusterlabs.org/pacemaker/"
 language: c
 primary_contact: "clumens@redhat.com"
diff --git a/projects/packaging/Dockerfile b/projects/packaging/Dockerfile
index 21e60181183f..10fef5e6091b 100644
--- a/projects/packaging/Dockerfile
+++ b/projects/packaging/Dockerfile
@@ -15,7 +15,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 git clone https://github.com/pypa/packaging packaging
 COPY *.sh *py $SRC/
 WORKDIR $SRC/packaging
diff --git a/projects/packaging/project.yaml b/projects/packaging/project.yaml
index 5b11b32878f1..565314c7b5a2 100644
--- a/projects/packaging/project.yaml
+++ b/projects/packaging/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/pypa/packaging
diff --git a/projects/pako/Dockerfile b/projects/pako/Dockerfile
index 7e69d2ca6847..97cbf4fb4fed 100644
--- a/projects/pako/Dockerfile
+++ b/projects/pako/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/pako/project.yaml b/projects/pako/project.yaml
index 239fdda67769..2e407fc944bb 100644
--- a/projects/pako/project.yaml
+++ b/projects/pako/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://nodeca.github.io/pako/
 language: javascript
 main_repo: https://github.com/nodeca/pako
diff --git a/projects/pandas/Dockerfile b/projects/pandas/Dockerfile
index e5874fd91f0b..d97a246f49f7 100644
--- a/projects/pandas/Dockerfile
+++ b/projects/pandas/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 libffi-dev
 # Ensure we work from right python version
 RUN apt-get install -y python3.9 python3.9-dev && \
diff --git a/projects/pandas/project.yaml b/projects/pandas/project.yaml
index a01baccd4505..cf5328c033ad 100644
--- a/projects/pandas/project.yaml
+++ b/projects/pandas/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/pandas-dev/pandas
diff --git a/projects/paramiko/Dockerfile b/projects/paramiko/Dockerfile
index 6057a9084c01..47774997feb4 100644
--- a/projects/paramiko/Dockerfile
+++ b/projects/paramiko/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
 RUN git clone --depth 1 https://github.com/paramiko/paramiko
diff --git a/projects/paramiko/project.yaml b/projects/paramiko/project.yaml
index 0085f49c5e82..e3e59cb947c5 100644
--- a/projects/paramiko/project.yaml
+++ b/projects/paramiko/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/paramiko/paramiko
diff --git a/projects/parse/Dockerfile b/projects/parse/Dockerfile
index 87fa5729ee53..53e592fad8b8 100644
--- a/projects/parse/Dockerfile
+++ b/projects/parse/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/r1chardj0n3s/parse parse
 COPY *.sh *py $SRC/
diff --git a/projects/parse/project.yaml b/projects/parse/project.yaml
index 8dbdb1b10446..2767d4dda0ea 100644
--- a/projects/parse/project.yaml
+++ b/projects/parse/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/r1chardj0n3s/parse
 main_repo: https://github.com/r1chardj0n3s/parse
 language: python
diff --git a/projects/parsimonious/Dockerfile b/projects/parsimonious/Dockerfile
index 324fb164e91f..f7d6dabebdf8 100644
--- a/projects/parsimonious/Dockerfile
+++ b/projects/parsimonious/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/erikrose/parsimonious parsimonious
 COPY *.sh *py $SRC/
diff --git a/projects/parsimonious/project.yaml b/projects/parsimonious/project.yaml
index b136a14e8813..5ba7e342f1b5 100644
--- a/projects/parsimonious/project.yaml
+++ b/projects/parsimonious/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/erikrose/parsimonious
 main_repo: https://github.com/erikrose/parsimonious
 language: python
diff --git a/projects/parso/Dockerfile b/projects/parso/Dockerfile
index a598a9f15f41..6798eab5eef4 100644
--- a/projects/parso/Dockerfile
+++ b/projects/parso/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/davidhalter/parso parso
 COPY *.sh *py $SRC/
 WORKDIR $SRC/parso
diff --git a/projects/parso/project.yaml b/projects/parso/project.yaml
index f3a1e456bcaf..066ba7427e96 100644
--- a/projects/parso/project.yaml
+++ b/projects/parso/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/davidhalter/parso
diff --git a/projects/pasta/Dockerfile b/projects/pasta/Dockerfile
index ab71f597cc02..2012e2f58acd 100644
--- a/projects/pasta/Dockerfile
+++ b/projects/pasta/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/google/pasta pasta
 COPY *.sh *py $SRC/
 WORKDIR $SRC/pasta
diff --git a/projects/pasta/project.yaml b/projects/pasta/project.yaml
index 77ab5416bd4b..be1793207b81 100644
--- a/projects/pasta/project.yaml
+++ b/projects/pasta/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/google/pasta
diff --git a/projects/pathlib2/Dockerfile b/projects/pathlib2/Dockerfile
index 585527d21d1a..27907f97b234 100644
--- a/projects/pathlib2/Dockerfile
+++ b/projects/pathlib2/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/jazzband/pathlib2 pathlib2
 COPY *.sh *py $SRC/
diff --git a/projects/pathlib2/project.yaml b/projects/pathlib2/project.yaml
index b1cd446b7142..9f32d70bc78c 100644
--- a/projects/pathlib2/project.yaml
+++ b/projects/pathlib2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/jazzband/pathlib2
 main_repo: https://github.com/jazzband/pathlib2
 language: python
diff --git a/projects/pborman-uuid/Dockerfile b/projects/pborman-uuid/Dockerfile
index 75ad3166d70f..fb15f694d5a2 100644
--- a/projects/pborman-uuid/Dockerfile
+++ b/projects/pborman-uuid/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/pborman/uuid
 WORKDIR $SRC/uuid
 COPY build.sh fuzz_test.go $SRC/
diff --git a/projects/pborman-uuid/project.yaml b/projects/pborman-uuid/project.yaml
index ebe063c8d6f4..e59907b3c23b 100644
--- a/projects/pborman-uuid/project.yaml
+++ b/projects/pborman-uuid/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/pborman/uuid"
 language: go
 main_repo: "https://github.com/pborman/uuid"
diff --git a/projects/pcapplusplus/Dockerfile b/projects/pcapplusplus/Dockerfile
index 178802a5caa6..71d21688fbd0 100644
--- a/projects/pcapplusplus/Dockerfile
+++ b/projects/pcapplusplus/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 autoconf flex bison
 RUN git clone --depth=1 https://github.com/seladb/PcapPlusPlus PcapPlusPlus
diff --git a/projects/pcapplusplus/project.yaml b/projects/pcapplusplus/project.yaml
index 039309540861..3042d1071ac6 100644
--- a/projects/pcapplusplus/project.yaml
+++ b/projects/pcapplusplus/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/seladb/PcapPlusPlus"
 language: c++
 primary_contact: "pcapplusplus@gmail.com"
diff --git a/projects/pcl/Dockerfile b/projects/pcl/Dockerfile
index a23010900bc2..46cfafa053bb 100644
--- a/projects/pcl/Dockerfile
+++ b/projects/pcl/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
 # ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
 RUN apt-get update && apt-get install -y make cmake autoconf \
     automake libtool gettext pkg-config build-essential \
diff --git a/projects/pcl/project.yaml b/projects/pcl/project.yaml
index f3236484b4ba..0e97ecc25753 100644
--- a/projects/pcl/project.yaml
+++ b/projects/pcl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 main_repo: "https://github.com/pointcloudlibrary/pcl"
 homepage: "http://pointclouds.org"
 language: c++
diff --git a/projects/pcre2/Dockerfile b/projects/pcre2/Dockerfile
index 136027c6b549..35af609dac4d 100644
--- a/projects/pcre2/Dockerfile
+++ b/projects/pcre2/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 subversion
 
 RUN git clone --recursive https://github.com/PCRE2Project/pcre2 pcre2
diff --git a/projects/pcre2/project.yaml b/projects/pcre2/project.yaml
index f0f942c4952d..65cbdb01f229 100644
--- a/projects/pcre2/project.yaml
+++ b/projects/pcre2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://www.pcre.org/"
 language: c++
 primary_contact: "nicholas@nickcwilson.co.uk"
diff --git a/projects/pdf-js/Dockerfile b/projects/pdf-js/Dockerfile
index 405d22151001..67395605469b 100644
--- a/projects/pdf-js/Dockerfile
+++ b/projects/pdf-js/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
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/mozilla/pdf.js pdf-js
 WORKDIR pdf-js
diff --git a/projects/pdf-js/project.yaml b/projects/pdf-js/project.yaml
index c5075fa9f52d..3d689b7535bf 100644
--- a/projects/pdf-js/project.yaml
+++ b/projects/pdf-js/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/mozilla/pdf.js"
 language: javascript
 primary_contact: "mcastelluccio@mozilla.com"
diff --git a/projects/pdfbox/Dockerfile b/projects/pdfbox/Dockerfile
index 03a15109ee93..c9439ba6e6ef 100644
--- a/projects/pdfbox/Dockerfile
+++ b/projects/pdfbox/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/pdfbox/project.yaml b/projects/pdfbox/project.yaml
index 5cdef7a9cb4c..dea300b36b60 100644
--- a/projects/pdfbox/project.yaml
+++ b/projects/pdfbox/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://pdfbox.apache.org/"
 language: jvm
 fuzzing_engines:
diff --git a/projects/pdfminersix/Dockerfile b/projects/pdfminersix/Dockerfile
index cdc0127e5c91..29207190e5fb 100644
--- a/projects/pdfminersix/Dockerfile
+++ b/projects/pdfminersix/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 pip3 install --upgrade pip
 RUN mkdir $SRC/corpus
 RUN git clone --depth 1 https://github.com/pdfminer/pdfminer.six.git pdfminer.six \
diff --git a/projects/pdfminersix/project.yaml b/projects/pdfminersix/project.yaml
index 14b83479c0fa..20e3184f1254 100644
--- a/projects/pdfminersix/project.yaml
+++ b/projects/pdfminersix/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://pdfminersix.readthedocs.io/en/latest/"
 language: python
 primary_contact: "pietermarsman@gmail.com"
diff --git a/projects/pdfplumber/Dockerfile b/projects/pdfplumber/Dockerfile
index 8b8fa552fbb0..4bccb57e6916 100644
--- a/projects/pdfplumber/Dockerfile
+++ b/projects/pdfplumber/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 pip3 install --upgrade pip
 RUN mkdir $SRC/corpus
 
diff --git a/projects/pdfplumber/project.yaml b/projects/pdfplumber/project.yaml
index 2ef91b3dc205..1621a2c02ed0 100644
--- a/projects/pdfplumber/project.yaml
+++ b/projects/pdfplumber/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/jsvine/pdfplumber"
 language: python
 primary_contact: "jsvine@gmail.com"
diff --git a/projects/pdoc/Dockerfile b/projects/pdoc/Dockerfile
index 4cadd29dd7b8..e393e5fa644f 100644
--- a/projects/pdoc/Dockerfile
+++ b/projects/pdoc/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/pdoc3/pdoc pdoc
 COPY *.sh *py $SRC/
diff --git a/projects/pdoc/project.yaml b/projects/pdoc/project.yaml
index 4adb5b7b7100..6f6811a8ffb3 100644
--- a/projects/pdoc/project.yaml
+++ b/projects/pdoc/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/pdoc3/pdoc
 main_repo: https://github.com/pdoc3/pdoc
 language: python
diff --git a/projects/pem/Dockerfile b/projects/pem/Dockerfile
index aece90228bf0..4e70c3cf6bc0 100644
--- a/projects/pem/Dockerfile
+++ b/projects/pem/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 python3 -m pip install --upgrade pip \
     && python3 -m pip install 'pyinstaller==6.10.0' 'setuptools==72.1.0' twisted
diff --git a/projects/pem/project.yaml b/projects/pem/project.yaml
index 5736e86febeb..f9cec99567d5 100644
--- a/projects/pem/project.yaml
+++ b/projects/pem/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/hynek/pem"
 language: python
 main_repo: "https://github.com/hynek/pem"
diff --git a/projects/pendulum/Dockerfile b/projects/pendulum/Dockerfile
index eb243c83eda1..194100b31c74 100644
--- a/projects/pendulum/Dockerfile
+++ b/projects/pendulum/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 tzdata
 RUN git clone https://github.com/sdispater/pendulum pendulum
 COPY *.sh *py $SRC/
diff --git a/projects/pendulum/project.yaml b/projects/pendulum/project.yaml
index 41c988c0e7f6..3dc37454ce51 100644
--- a/projects/pendulum/project.yaml
+++ b/projects/pendulum/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/sdispater/pendulum
diff --git a/projects/perfetto/Dockerfile b/projects/perfetto/Dockerfile
index 1ab2c35dd633..ce0631a2063d 100644
--- a/projects/perfetto/Dockerfile
+++ b/projects/perfetto/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 apt-get -y install python curl
diff --git a/projects/perfetto/project.yaml b/projects/perfetto/project.yaml
index 3ff0d85f28da..9a61963368ad 100644
--- a/projects/perfetto/project.yaml
+++ b/projects/perfetto/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://perfetto.dev"
 language: c++
 primary_contact: "hjd@google.com"
diff --git a/projects/pest/Dockerfile b/projects/pest/Dockerfile
index 560b93b89cf4..50596df21016 100644
--- a/projects/pest/Dockerfile
+++ b/projects/pest/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder-rust as builder
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04 as builder
 
 ## Install build dependencies.
 RUN apt-get update
diff --git a/projects/pest/project.yaml b/projects/pest/project.yaml
index 2599a224c1e1..592d28b37d42 100644
--- a/projects/pest/project.yaml
+++ b/projects/pest/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/pest-parser/pest"
 language: rust
 primary_contact: "jstnlefebvre@gmail.com"
diff --git a/projects/pffft/Dockerfile b/projects/pffft/Dockerfile
index 221d63b103d7..962541349220 100644
--- a/projects/pffft/Dockerfile
+++ b/projects/pffft/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 mercurial
 RUN python -m pip install numpy
 RUN git clone https://bitbucket.org/jpommier/pffft $SRC/pffft
diff --git a/projects/pffft/project.yaml b/projects/pffft/project.yaml
index cda28b06488c..c036ab7d49bc 100644
--- a/projects/pffft/project.yaml
+++ b/projects/pffft/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://bitbucket.org/jpommier/pffft"
 main_repo: "https://bitbucket.org/jpommier/pffft.git"
 language: c++
diff --git a/projects/phmap/Dockerfile b/projects/phmap/Dockerfile
index 3aa7d8996224..3789c6304f65 100755
--- a/projects/phmap/Dockerfile
+++ b/projects/phmap/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/greg7mdp/parallel-hashmap
 
 WORKDIR $SRC/parallel-hashmap
diff --git a/projects/phmap/project.yaml b/projects/phmap/project.yaml
index e783dd7993b9..28fac13b6adf 100755
--- a/projects/phmap/project.yaml
+++ b/projects/phmap/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/greg7mdp/parallel-hashmap"
 main_repo: 'https://github.com/greg7mdp/parallel-hashmap'
 primary_contact: "greg7mdp@gmail.com"
diff --git a/projects/php/Dockerfile b/projects/php/Dockerfile
index c086f5f53808..e7d79fd346c2 100644
--- a/projects/php/Dockerfile
+++ b/projects/php/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 libtool bison re2c pkg-config
 RUN git clone --depth 1 --branch master https://github.com/php/php-src.git php-src
diff --git a/projects/php/project.yaml b/projects/php/project.yaml
index ac74fe5ec52f..a09509c2f170 100644
--- a/projects/php/project.yaml
+++ b/projects/php/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://php.net/"
 language: c++
 primary_contact: "stas@php.net"
diff --git a/projects/picotls/Dockerfile b/projects/picotls/Dockerfile
index 5d7dcc957b0c..86b957134724 100644
--- a/projects/picotls/Dockerfile
+++ b/projects/picotls/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 cmake pkg-config libssl-dev
 RUN git clone https://github.com/h2o/picotls
 WORKDIR picotls
diff --git a/projects/picotls/project.yaml b/projects/picotls/project.yaml
index bf119b028b9d..1a61c1f00074 100644
--- a/projects/picotls/project.yaml
+++ b/projects/picotls/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/h2o/picotls"
 language: c++
 primary_contact: "jonathan.foote@gmail.com"
diff --git a/projects/pidgin/Dockerfile b/projects/pidgin/Dockerfile
index 8962d5a52ab0..284064aaa3d3 100644
--- a/projects/pidgin/Dockerfile
+++ b/projects/pidgin/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 --no-install-recommends \
         make autoconf automake libtool texinfo libltdl-dev pkg-config \
diff --git a/projects/pidgin/project.yaml b/projects/pidgin/project.yaml
index 9b277e55fe16..960a64f5fcd3 100644
--- a/projects/pidgin/project.yaml
+++ b/projects/pidgin/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.pidgin.im/"
 primary_contact: "gary.kramlich@gmail.com"
 language: c