diff --git a/projects/cascadia/Dockerfile b/projects/cascadia/Dockerfile
index 6f4f5d7b2560..502da582faf9 100644
--- a/projects/cascadia/Dockerfile
+++ b/projects/cascadia/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/andybalholm/cascadia
 
 COPY build.sh $SRC/
diff --git a/projects/cascadia/project.yaml b/projects/cascadia/project.yaml
index fba3e9e7f90d..bbe6429e3dcc 100644
--- a/projects/cascadia/project.yaml
+++ b/projects/cascadia/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/andybalholm/cascadia"
 primary_contact: "cascadia@balholm.com"
 auto_ccs :
diff --git a/projects/casync/Dockerfile b/projects/casync/Dockerfile
index da6bab7cd4a6..84191bc99bb3 100644
--- a/projects/casync/Dockerfile
+++ b/projects/casync/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 pkg-config wget \
diff --git a/projects/casync/project.yaml b/projects/casync/project.yaml
index cbd7f094622b..2473c7a4e99e 100644
--- a/projects/casync/project.yaml
+++ b/projects/casync/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/casync/casync"
 language: c++
 primary_contact: "lennart@poettering.net"
diff --git a/projects/cbor-java/Dockerfile b/projects/cbor-java/Dockerfile
index cca8575ba3a7..696e72e3ddc8 100644
--- a/projects/cbor-java/Dockerfile
+++ b/projects/cbor-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 apt-get update && apt-get install -y make autoconf automake libtool wget
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
diff --git a/projects/cbor-java/project.yaml b/projects/cbor-java/project.yaml
index 947d377d3a5c..820845168adc 100644
--- a/projects/cbor-java/project.yaml
+++ b/projects/cbor-java/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://android.googlesource.com/platform/external/cbor-java/+/refs/heads/master"
 language: jvm
 primary_contact: "constantin.rack@gmail.com"
diff --git a/projects/cbor2/Dockerfile b/projects/cbor2/Dockerfile
index d16e8e22dbc2..1c74a2316eca 100644
--- a/projects/cbor2/Dockerfile
+++ b/projects/cbor2/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/agronholm/cbor2.git
 WORKDIR cbor2
 COPY build.sh *.py $SRC/
diff --git a/projects/cbor2/project.yaml b/projects/cbor2/project.yaml
index 6094773cbde1..f7937e1d29d8 100644
--- a/projects/cbor2/project.yaml
+++ b/projects/cbor2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/agronholm/cbor2"
 main_repo: "https://github.com/agronholm/cbor2"
 language: python
diff --git a/projects/cctz/Dockerfile b/projects/cctz/Dockerfile
index 7882330f524c..cba1d8603b26 100644
--- a/projects/cctz/Dockerfile
+++ b/projects/cctz/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 libgtest-dev
 RUN git clone --depth 1 https://github.com/google/cctz
 WORKDIR $SRC/cctz
diff --git a/projects/cctz/project.yaml b/projects/cctz/project.yaml
index 231a3cba561d..681f59b1d786 100644
--- a/projects/cctz/project.yaml
+++ b/projects/cctz/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/google/cctz
 main_repo: https://github.com/google/cctz
 language: c++
diff --git a/projects/cel-cpp/Dockerfile b/projects/cel-cpp/Dockerfile
index d080690df61e..e39a11952f25 100644
--- a/projects/cel-cpp/Dockerfile
+++ b/projects/cel-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 apt-get update && apt-get install python3 openjdk-11-jdk -y
 RUN git clone --depth 1 https://github.com/google/cel-cpp/
diff --git a/projects/cel-cpp/project.yaml b/projects/cel-cpp/project.yaml
index 15f4ca7a28ac..7efd6132d93b 100644
--- a/projects/cel-cpp/project.yaml
+++ b/projects/cel-cpp/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://cel.dev"
 language: c++
 primary_contact: "tswadell@google.com"
diff --git a/projects/cel-go/Dockerfile b/projects/cel-go/Dockerfile
index a3997a080f3e..ae46be90010e 100644
--- a/projects/cel-go/Dockerfile
+++ b/projects/cel-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/google/cel-go
 
 RUN apt-get update && apt-get install -y protobuf-compiler libprotobuf-dev binutils cmake \
diff --git a/projects/cel-go/project.yaml b/projects/cel-go/project.yaml
index 752ae9f32b68..a1ecc3796670 100644
--- a/projects/cel-go/project.yaml
+++ b/projects/cel-go/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://opensource.google/projects/cel"
 primary_contact: "tswadell@google.com"
 auto_ccs:
diff --git a/projects/cert-manager/Dockerfile b/projects/cert-manager/Dockerfile
index e94765f762dd..18ae73abe816 100644
--- a/projects/cert-manager/Dockerfile
+++ b/projects/cert-manager/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/cert-manager/cert-manager --depth=1
 COPY build.sh pki_fuzzer.go $SRC/
 WORKDIR $SRC/cert-manager
diff --git a/projects/cert-manager/project.yaml b/projects/cert-manager/project.yaml
index 97e5a673f1c7..3b66917307f8 100644
--- a/projects/cert-manager/project.yaml
+++ b/projects/cert-manager/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://cert-manager.io"
 # Send reports to the cert-manager-security distribution list.
 # - https://cert-manager.io/docs/contributing/security/
diff --git a/projects/cfengine/Dockerfile b/projects/cfengine/Dockerfile
index 23316d1df1ad..e3c38cb07d9e 100644
--- a/projects/cfengine/Dockerfile
+++ b/projects/cfengine/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 libpcre2-dev libtool autoconf automake bison flex libssl-dev \
   libbison-dev libacl1 libacl1-dev lmdb-utils liblmdb-dev libpam0g-dev libtool \
diff --git a/projects/cfengine/project.yaml b/projects/cfengine/project.yaml
index 628473126900..1e0d1a24cc39 100644
--- a/projects/cfengine/project.yaml
+++ b/projects/cfengine/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/cfengine/core"
 main_repo: "https://github.com/cfengine/core"
 language: c++
diff --git a/projects/cffi/Dockerfile b/projects/cffi/Dockerfile
index b06c01038bc1..f0cfa3efd152 100644
--- a/projects/cffi/Dockerfile
+++ b/projects/cffi/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 apt-get install -y libffi-dev mercurial
 RUN hg clone https://foss.heptapod.net/pypy/cffi cffi
 COPY *.sh *py $SRC/
diff --git a/projects/cffi/project.yaml b/projects/cffi/project.yaml
index ef8f255d1c27..84646536527d 100644
--- a/projects/cffi/project.yaml
+++ b/projects/cffi/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://foss.heptapod.net/pypy/cffi
diff --git a/projects/cgif/Dockerfile b/projects/cgif/Dockerfile
index ebbf2a239b7b..a702d786266b 100644
--- a/projects/cgif/Dockerfile
+++ b/projects/cgif/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 zip
 RUN pip3 install meson ninja
 RUN git clone --depth 1 https://github.com/dloebl/cgif.git
diff --git a/projects/cgif/project.yaml b/projects/cgif/project.yaml
index 7a2788049ffd..59a4b7395878 100644
--- a/projects/cgif/project.yaml
+++ b/projects/cgif/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/dloebl/cgif"
 language: c
 primary_contact: "dloebl.2000@gmail.com"
diff --git a/projects/cglib/Dockerfile b/projects/cglib/Dockerfile
index 55f62f9db73b..dde71c8f4ada 100644
--- a/projects/cglib/Dockerfile
+++ b/projects/cglib/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
 
 ENV JAVA_HOME $JAVA_15_HOME
 ENV JVM_LD_LIBRARY_PATH $JAVA_HOME/lib/server
diff --git a/projects/cglib/project.yaml b/projects/cglib/project.yaml
index de97bdd20f96..646a44796f1c 100644
--- a/projects/cglib/project.yaml
+++ b/projects/cglib/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/cglib/cglib/wiki"
 language: jvm
 main_repo: "https://github.com/cglib/cglib"
diff --git a/projects/chardet/Dockerfile b/projects/chardet/Dockerfile
index 48f67c1f9bb1..10e29b770769 100644
--- a/projects/chardet/Dockerfile
+++ b/projects/chardet/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/erikrose/chardet chardet
 COPY *.sh *py $SRC/
 WORKDIR $SRC/chardet
diff --git a/projects/chardet/project.yaml b/projects/chardet/project.yaml
index b6722e9d9866..641522129f33 100644
--- a/projects/chardet/project.yaml
+++ b/projects/chardet/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/erikrose/chardet
diff --git a/projects/charset_normalizer/Dockerfile b/projects/charset_normalizer/Dockerfile
index 6bffe68278f9..7bc7078bc303 100644
--- a/projects/charset_normalizer/Dockerfile
+++ b/projects/charset_normalizer/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/jawah/charset_normalizer charset_normalizer
 WORKDIR charset_normalizer
diff --git a/projects/charset_normalizer/project.yaml b/projects/charset_normalizer/project.yaml
index 0457dd9b54a6..21cf18a2ab95 100644
--- a/projects/charset_normalizer/project.yaml
+++ b/projects/charset_normalizer/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/jawah/charset_normalizer
diff --git a/projects/checker-framework/Dockerfile b/projects/checker-framework/Dockerfile
index fb97e17ee0f9..4386a55588ac 100644
--- a/projects/checker-framework/Dockerfile
+++ b/projects/checker-framework/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/checker-framework/project.yaml b/projects/checker-framework/project.yaml
index 23dd2733b38c..d35b34129418 100644
--- a/projects/checker-framework/project.yaml
+++ b/projects/checker-framework/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/typetools/checker-framework"
 language: jvm
 main_repo: "git@github.com:typetools/checker-framework.git"
diff --git a/projects/checkstyle/Dockerfile b/projects/checkstyle/Dockerfile
index bac8cc588e93..8f839a1473fb 100644
--- a/projects/checkstyle/Dockerfile
+++ b/projects/checkstyle/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/checkstyle/project.yaml b/projects/checkstyle/project.yaml
index 32ea82bf7600..0e08a5a4d095 100644
--- a/projects/checkstyle/project.yaml
+++ b/projects/checkstyle/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/checkstyle/checkstyle
diff --git a/projects/chrono/Dockerfile b/projects/chrono/Dockerfile
index f53a4791feeb..5f62f4ff033f 100644
--- a/projects/chrono/Dockerfile
+++ b/projects/chrono/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/chronotope/chrono chrono
 WORKDIR $SRC
diff --git a/projects/chrono/project.yaml b/projects/chrono/project.yaml
index 1a4c233df5f7..c30ed861b0e1 100644
--- a/projects/chrono/project.yaml
+++ b/projects/chrono/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/chronotope/chrono"
 main_repo: "https://github.com/chronotope/chrono.git"
 language: rust
diff --git a/projects/cilium/Dockerfile b/projects/cilium/Dockerfile
index 0dfb7500e398..219a0e738d24 100644
--- a/projects/cilium/Dockerfile
+++ b/projects/cilium/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 wget
 RUN wget https://raw.githubusercontent.com/google/AFL/master/dictionaries/json.dict -O $OUT/fuzz.dict
 
diff --git a/projects/cilium/project.yaml b/projects/cilium/project.yaml
index 248f6b6c2587..7fb89bdaf6f1 100644
--- a/projects/cilium/project.yaml
+++ b/projects/cilium/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://cilium.io"
 language: go
 primary_contact: "security@cilium.io"
diff --git a/projects/circl/Dockerfile b/projects/circl/Dockerfile
index af93fbb0ee87..a1d8946b833e 100644
--- a/projects/circl/Dockerfile
+++ b/projects/circl/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 wget python
 RUN git clone --depth 1 https://github.com/MozillaSecurity/cryptofuzz
diff --git a/projects/circl/project.yaml b/projects/circl/project.yaml
index 10adebb4d8ec..5c77a9ed00f2 100644
--- a/projects/circl/project.yaml
+++ b/projects/circl/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/cloudflare/circl"
 language: c++
 primary_contact: "guidovranken@gmail.com"
diff --git a/projects/civetweb/Dockerfile b/projects/civetweb/Dockerfile
index 523cf01076f1..aa6f8d034bdd 100755
--- a/projects/civetweb/Dockerfile
+++ b/projects/civetweb/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 zlib1g-dev
 RUN git clone https://github.com/civetweb/civetweb
 
diff --git a/projects/civetweb/project.yaml b/projects/civetweb/project.yaml
index f09c3f8cb22f..fa1d76ede51c 100755
--- a/projects/civetweb/project.yaml
+++ b/projects/civetweb/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/civetweb/civetweb"
 primary_contact: "bel2125@gmail.com"
 language: c
diff --git a/projects/cjson/Dockerfile b/projects/cjson/Dockerfile
index 30597b86b45e..27d6f25f4fcc 100644
--- a/projects/cjson/Dockerfile
+++ b/projects/cjson/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
diff --git a/projects/cjson/project.yaml b/projects/cjson/project.yaml
index 351f8725e934..d394da538e08 100644
--- a/projects/cjson/project.yaml
+++ b/projects/cjson/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/DaveGamble/cJSON"
 language: c++
 primary_contact: "max@maxbruckner.de"
diff --git a/projects/clamav/Dockerfile b/projects/clamav/Dockerfile
index 26b29cc161e4..ce14fe2d9e7f 100644
--- a/projects/clamav/Dockerfile
+++ b/projects/clamav/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 \
     flex bison \
     python3-dev \
diff --git a/projects/clamav/project.yaml b/projects/clamav/project.yaml
index 1f8f5d7023b4..d053efb42309 100644
--- a/projects/clamav/project.yaml
+++ b/projects/clamav/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.clamav.net/"
 language: c++
 primary_contact: "clamav.fuzz@gmail.com"
diff --git a/projects/clib/Dockerfile b/projects/clib/Dockerfile
index 275657a8134b..6834bbb4784d 100644
--- a/projects/clib/Dockerfile
+++ b/projects/clib/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 libcurl4-gnutls-dev -qq
 RUN git clone --depth 1 https://github.com/clibs/clib
 WORKDIR $SRC/
diff --git a/projects/clib/project.yaml b/projects/clib/project.yaml
index bc5871351bc6..18b05c474c3e 100644
--- a/projects/clib/project.yaml
+++ b/projects/clib/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/clibs/clib"
 language: c
 primary_contact: "joseph.werle@gmail.com"
diff --git a/projects/click/Dockerfile b/projects/click/Dockerfile
index 4e485d0724c7..13743f940e7f 100644
--- a/projects/click/Dockerfile
+++ b/projects/click/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/click click
 COPY *.sh *py $SRC/
 WORKDIR $SRC/click
diff --git a/projects/click/project.yaml b/projects/click/project.yaml
index 883200043ef2..677b01b9bb9f 100644
--- a/projects/click/project.yaml
+++ b/projects/click/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/pallets/click
diff --git a/projects/clock/Dockerfile b/projects/clock/Dockerfile
index d5ce9fb016ec..cf0cfe9af5b6 100644
--- a/projects/clock/Dockerfile
+++ b/projects/clock/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/benbjohnson/clock
 WORKDIR clock
 COPY build.sh fuzz_test.go $SRC/
diff --git a/projects/clock/project.yaml b/projects/clock/project.yaml
index 20c1c3c0f0af..7bf39009f015 100644
--- a/projects/clock/project.yaml
+++ b/projects/clock/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/benbjohnson/clock"
 language: go
 main_repo: "https://github.com/benbjohnson/clock"
diff --git a/projects/closure-library/Dockerfile b/projects/closure-library/Dockerfile
index c68e04e9c363..0f832762dc6f 100644
--- a/projects/closure-library/Dockerfile
+++ b/projects/closure-library/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/closure-library/project.yaml b/projects/closure-library/project.yaml
index ba4dcc6dcada..06d69b681499 100644
--- a/projects/closure-library/project.yaml
+++ b/projects/closure-library/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://developers.google.com/closure/library/
 language: javascript
 main_repo: https://github.com/google/closure-library
diff --git a/projects/cloud-hypervisor/Dockerfile b/projects/cloud-hypervisor/Dockerfile
index 398fdaf6da4e..1e9e19dc0cd0 100644
--- a/projects/cloud-hypervisor/Dockerfile
+++ b/projects/cloud-hypervisor/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/cloud-hypervisor/project.yaml b/projects/cloud-hypervisor/project.yaml
index eeaf2b80d790..c57aa86bac3c 100644
--- a/projects/cloud-hypervisor/project.yaml
+++ b/projects/cloud-hypervisor/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/cloud-hypervisor/cloud-hypervisor"
 language: rust
 primary_contact: "bo.arvin.chen@gmail.com"
diff --git a/projects/cmake/Dockerfile b/projects/cmake/Dockerfile
index 2b7c2ef0f2a2..c5f314d883a8 100644
--- a/projects/cmake/Dockerfile
+++ b/projects/cmake/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 libssl-dev
 RUN git clone --depth 1 https://gitlab.kitware.com/cmake/cmake CMake
diff --git a/projects/cmake/project.yaml b/projects/cmake/project.yaml
index 5f60a7df47be..aa389d66f33a 100644
--- a/projects/cmake/project.yaml
+++ b/projects/cmake/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://gitlab.kitware.com/cmake/cmake"
 main_repo: "https://gitlab.kitware.com/cmake/cmake"
 language: c
diff --git a/projects/cmark/Dockerfile b/projects/cmark/Dockerfile
index 35fb70229979..481c3725659d 100644
--- a/projects/cmark/Dockerfile
+++ b/projects/cmark/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 python3
 RUN git clone --depth 1 https://github.com/commonmark/cmark.git cmark
 WORKDIR cmark
diff --git a/projects/cmark/project.yaml b/projects/cmark/project.yaml
index 276fc4c4bc8e..d6141d6a87cd 100644
--- a/projects/cmark/project.yaml
+++ b/projects/cmark/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://commonmark.org"
 language: c++
 primary_contact: "jgm@berkeley.edu"
diff --git a/projects/cockroachdb/Dockerfile b/projects/cockroachdb/Dockerfile
index 4c81dc5ecbcc..4bc579bbe25f 100644
--- a/projects/cockroachdb/Dockerfile
+++ b/projects/cockroachdb/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/cockroachdb/cockroach.git cockroach
 RUN wget https://go.dev/dl/go1.22.9.linux-amd64.tar.gz \
diff --git a/projects/cockroachdb/project.yaml b/projects/cockroachdb/project.yaml
index 0c6260840c20..e0f6f988781e 100644
--- a/projects/cockroachdb/project.yaml
+++ b/projects/cockroachdb/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.cockroachlabs.com/"
 language: go
 primary_contact: "stan@cockroachlabs.com"
diff --git a/projects/compress/Dockerfile b/projects/compress/Dockerfile
index 07beb41a45e5..b9b17849b2ef 100644
--- a/projects/compress/Dockerfile
+++ b/projects/compress/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/klauspost/compress
 RUN git clone --depth 1 https://github.com/klauspost/compress-fuzz
 WORKDIR compress
diff --git a/projects/compress/project.yaml b/projects/compress/project.yaml
index d4b3ef18482c..dd1c43505ce5 100644
--- a/projects/compress/project.yaml
+++ b/projects/compress/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/klauspost/compress"
 language: go
 primary_contact: "klauspost@gmail.com"
diff --git a/projects/config-validator/Dockerfile b/projects/config-validator/Dockerfile
index e17d15b155b9..e35430861e6a 100644
--- a/projects/config-validator/Dockerfile
+++ b/projects/config-validator/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
 
 # Clone the actual repo with the fuzz target.
 RUN git clone --depth 1 https://github.com/GoogleCloudPlatform/config-validator $GOPATH/src/github.com/GoogleCloudPlatform/config-validator
diff --git a/projects/config-validator/project.yaml b/projects/config-validator/project.yaml
index 09d92c861cc3..925c7b326284 100644
--- a/projects/config-validator/project.yaml
+++ b/projects/config-validator/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/GoogleCloudPlatform/config-validator/"
 main_repo: "https://github.com/GoogleCloudPlatform/config-validator/"
 primary_contact: "mpetkov@google.com"
diff --git a/projects/configparser/Dockerfile b/projects/configparser/Dockerfile
index b328b69d6370..86d3011b3add 100644
--- a/projects/configparser/Dockerfile
+++ b/projects/configparser/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 python -m pip install 'setuptools~=69.0'
 RUN git clone https://github.com/jaraco/configparser/ configparser
 COPY *.sh *py $SRC/
diff --git a/projects/configparser/project.yaml b/projects/configparser/project.yaml
index d32a0d0716e7..5754cf8a85ec 100644
--- a/projects/configparser/project.yaml
+++ b/projects/configparser/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/jaraco/configparser/
 main_repo: https://github.com/jaraco/configparser/
 language: python
diff --git a/projects/connectedhomeip/Dockerfile b/projects/connectedhomeip/Dockerfile
index 3fb3e58ef573..fc774936dde2 100644
--- a/projects/connectedhomeip/Dockerfile
+++ b/projects/connectedhomeip/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 prerequisite packages
 # See connectedhomeip/docs/guides/BUILDING.md#prerequisites
diff --git a/projects/connectedhomeip/project.yaml b/projects/connectedhomeip/project.yaml
index 4af1638e15ea..6fc177589aab 100644
--- a/projects/connectedhomeip/project.yaml
+++ b/projects/connectedhomeip/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://buildwithmatter.com/"
 language: c++
 primary_contact: "andreilitvin@google.com"
diff --git a/projects/connexion/Dockerfile b/projects/connexion/Dockerfile
index 2451ce4c2967..d14c97bd615e 100644
--- a/projects/connexion/Dockerfile
+++ b/projects/connexion/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 asgiref flask
 RUN git clone --depth=1 https://github.com/python-jsonschema/jsonschema-specifications jsonschema_specifications
 RUN git clone https://github.com/spec-first/connexion connexion
diff --git a/projects/connexion/project.yaml b/projects/connexion/project.yaml
index b44de391f960..023a9a3972c6 100644
--- a/projects/connexion/project.yaml
+++ b/projects/connexion/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/spec-first/connexion
 main_repo: https://github.com/spec-first/connexion
 language: python
diff --git a/projects/cosmos-sdk/Dockerfile b/projects/cosmos-sdk/Dockerfile
index b40b026b232f..228375d4841c 100644
--- a/projects/cosmos-sdk/Dockerfile
+++ b/projects/cosmos-sdk/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/cosmos/cosmos-sdk
 
 COPY build.sh $SRC
diff --git a/projects/cosmos-sdk/project.yaml b/projects/cosmos-sdk/project.yaml
index 45c55d8119ca..8b3531360d9b 100644
--- a/projects/cosmos-sdk/project.yaml
+++ b/projects/cosmos-sdk/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/cosmos/cosmos-sdk"
 primary_contact: "fuzzing@orijtech.com"
 auto_ccs:
diff --git a/projects/coturn/Dockerfile b/projects/coturn/Dockerfile
index 3b511f53de76..2c0872153971 100644
--- a/projects/coturn/Dockerfile
+++ b/projects/coturn/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 libssl-dev libevent-dev
 RUN git clone https://github.com/coturn/coturn
 COPY build.sh $SRC/
diff --git a/projects/coturn/project.yaml b/projects/coturn/project.yaml
index cff1947f8313..c274d69deeff 100644
--- a/projects/coturn/project.yaml
+++ b/projects/coturn/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/coturn/coturn"
 language: c
 primary_contact: "misi@majd.eu"
diff --git a/projects/coveragepy/Dockerfile b/projects/coveragepy/Dockerfile
index 6eb650488634..a1afd731e3bf 100644
--- a/projects/coveragepy/Dockerfile
+++ b/projects/coveragepy/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/nedbat/coveragepy
 WORKDIR coveragepy
diff --git a/projects/coveragepy/project.yaml b/projects/coveragepy/project.yaml
index 9a074869dc5d..8384d742c199 100644
--- a/projects/coveragepy/project.yaml
+++ b/projects/coveragepy/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/nedbat/coveragepy/
diff --git a/projects/cpp-httplib/Dockerfile b/projects/cpp-httplib/Dockerfile
index 3889e5c8c60e..a91bcdeb4223 100644
--- a/projects/cpp-httplib/Dockerfile
+++ b/projects/cpp-httplib/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 brotli.
diff --git a/projects/cpp-httplib/project.yaml b/projects/cpp-httplib/project.yaml
index cc3edb6ef203..92fb8d5fb43d 100644
--- a/projects/cpp-httplib/project.yaml
+++ b/projects/cpp-httplib/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/yhirose/cpp-httplib"
 language: c++
 primary_contact: "yuji.hirose.bug@gmail.com"
diff --git a/projects/cppcheck/Dockerfile b/projects/cppcheck/Dockerfile
index b2ccfde59ccd..247770276dc5 100644
--- a/projects/cppcheck/Dockerfile
+++ b/projects/cppcheck/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/danmar/cppcheck.git
 
diff --git a/projects/cppcheck/project.yaml b/projects/cppcheck/project.yaml
index aea2ec998b4d..38fed076c56f 100644
--- a/projects/cppcheck/project.yaml
+++ b/projects/cppcheck/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://cppcheck.sourceforge.net"
 language: c++
 primary_contact: "daniel.marjamaki@gmail.com"
diff --git a/projects/cppitertools/Dockerfile b/projects/cppitertools/Dockerfile
index c22b5c0bbc3f..7b894bb3ba5d 100644
--- a/projects/cppitertools/Dockerfile
+++ b/projects/cppitertools/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/ryanhaining/cppitertools cppitertools
 WORKDIR cppitertools
diff --git a/projects/cppitertools/project.yaml b/projects/cppitertools/project.yaml
index 5c5cf4b3caec..71db8a851d8b 100644
--- a/projects/cppitertools/project.yaml
+++ b/projects/cppitertools/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ryanhaining/cppitertools"
 main_repo: "https://github.com/ryanhaining/cppitertools"
 language: c++
diff --git a/projects/cpuinfo/Dockerfile b/projects/cpuinfo/Dockerfile
index 9ecc0dbf6d36..9feadca79109 100644
--- a/projects/cpuinfo/Dockerfile
+++ b/projects/cpuinfo/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/pytorch/cpuinfo
 WORKDIR cpuinfo
diff --git a/projects/cpuinfo/project.yaml b/projects/cpuinfo/project.yaml
index b3982cc6e023..5220c4589a33 100644
--- a/projects/cpuinfo/project.yaml
+++ b/projects/cpuinfo/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/pytorch/cpuinfo"
 main_repo: "https://github.com/pytorch/cpuinfo"
 language: c
diff --git a/projects/cpython3/Dockerfile b/projects/cpython3/Dockerfile
index 81925ae5118b..d8c9c32489d6 100644
--- a/projects/cpython3/Dockerfile
+++ b/projects/cpython3/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 build-essential libncursesw5-dev \
diff --git a/projects/cpython3/project.yaml b/projects/cpython3/project.yaml
index 92d62280a6e5..465644441d8b 100644
--- a/projects/cpython3/project.yaml
+++ b/projects/cpython3/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://python.org/"
 language: c++
 primary_contact: "seth@python.org"
diff --git a/projects/cras/Dockerfile b/projects/cras/Dockerfile
index 7036bc8e6db2..5dda8bc73c5a 100644
--- a/projects/cras/Dockerfile
+++ b/projects/cras/Dockerfile
@@ -19,7 +19,7 @@
 ################################################################################
 # Defines a docker image that can build cras fuzzers.
 #
-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04
 
 RUN apt-get -y update && \
       apt-get install -y \
diff --git a/projects/cras/project.yaml b/projects/cras/project.yaml
index 2430f43178fc..660976cf7091 100644
--- a/projects/cras/project.yaml
+++ b/projects/cras/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.chromium.org"
 language: rust
 primary_contact: "cujomalainey@chromium.org"
diff --git a/projects/cri-o/Dockerfile b/projects/cri-o/Dockerfile
index 67f2d0f302c5..439c12a67964 100644
--- a/projects/cri-o/Dockerfile
+++ b/projects/cri-o/Dockerfile
@@ -14,8 +14,8 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN apt-get update && apt-get install -y libaio-dev autoconf gettext texinfo \
 	libbtrfs-dev git libassuan-dev libdevmapper-dev libglib2.0-dev libc6-dev \
 	libgpgme-dev libgpg-error-dev libseccomp-dev libsystemd-dev libselinux1-dev \
diff --git a/projects/cri-o/project.yaml b/projects/cri-o/project.yaml
index 6dc21693e725..f4588da8ceb6 100644
--- a/projects/cri-o/project.yaml
+++ b/projects/cri-o/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://cri-o.io/"
 main_repo: "https://github.com/cri-o/cri-o"
 primary_contact: "cncf-crio-security@lists.cncf.io"
diff --git a/projects/croaring/Dockerfile b/projects/croaring/Dockerfile
index 853b087a1063..0127d442c06d 100644
--- a/projects/croaring/Dockerfile
+++ b/projects/croaring/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/RoaringBitmap/CRoaring croaring
 RUN mv croaring/fuzz/* $SRC/
diff --git a/projects/croaring/project.yaml b/projects/croaring/project.yaml
index 9d580472d00c..5b75cb020f81 100644
--- a/projects/croaring/project.yaml
+++ b/projects/croaring/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://roaringbitmap.org"
 language: c
 primary_contact: "lemire@gmail.com"
diff --git a/projects/cron-utils/Dockerfile b/projects/cron-utils/Dockerfile
index b2fbdb772b55..bbfd5e0c5277 100644
--- a/projects/cron-utils/Dockerfile
+++ b/projects/cron-utils/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.7/binaries/apache-maven-3.8.7-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
diff --git a/projects/cron-utils/project.yaml b/projects/cron-utils/project.yaml
index ed5fd3966bfc..88f2b2a1ce7f 100644
--- a/projects/cron-utils/project.yaml
+++ b/projects/cron-utils/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/jmrozanec/cron-utils"
 language: jvm
 primary_contact: ""
diff --git a/projects/croniter/Dockerfile b/projects/croniter/Dockerfile
index f8158e98eb57..d375a82c51f6 100644
--- a/projects/croniter/Dockerfile
+++ b/projects/croniter/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/kiorky/croniter
 COPY build.sh *.py $SRC/
 WORKDIR croniter
diff --git a/projects/croniter/project.yaml b/projects/croniter/project.yaml
index 3e34b5485d7f..bfeee2683df9 100644
--- a/projects/croniter/project.yaml
+++ b/projects/croniter/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/kiorky/croniter
diff --git a/projects/crossplane/Dockerfile b/projects/crossplane/Dockerfile
index 02264519fe77..8b1fc695990f 100644
--- a/projects/crossplane/Dockerfile
+++ b/projects/crossplane/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/crossplane/crossplane-runtime $SRC/crossplane-runtime
 RUN git clone --depth 1 https://github.com/crossplane/crossplane $SRC/crossplane
 COPY build.sh $SRC/
diff --git a/projects/crossplane/project.yaml b/projects/crossplane/project.yaml
index e021e3713b17..210053b21150 100644
--- a/projects/crossplane/project.yaml
+++ b/projects/crossplane/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/crossplane/crossplane"
 main_repo: "https://github.com/crossplane/crossplane"
 primary_contact: "jbw976@gmail.com"
diff --git a/projects/crosvm/Dockerfile b/projects/crosvm/Dockerfile
index c4f4cd62a170..b85a74243433 100644
--- a/projects/crosvm/Dockerfile
+++ b/projects/crosvm/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 --recursive https://chromium.googlesource.com/crosvm/crosvm $SRC/crosvm
 
diff --git a/projects/crosvm/project.yaml b/projects/crosvm/project.yaml
index d3c79020260c..1a30e04e9f1f 100644
--- a/projects/crosvm/project.yaml
+++ b/projects/crosvm/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://crosvm.dev"
 language: rust
 primary_contact: "denniskempin@google.com"
diff --git a/projects/crow/Dockerfile b/projects/crow/Dockerfile
index fa25bf2c2dd8..895d8e967d8c 100644
--- a/projects/crow/Dockerfile
+++ b/projects/crow/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 make libasio-dev
 
 RUN git clone --depth 1 https://github.com/CrowCpp/Crow.git crow
diff --git a/projects/crow/project.yaml b/projects/crow/project.yaml
index 6c264daf9c75..eba7bcc5d837 100644
--- a/projects/crow/project.yaml
+++ b/projects/crow/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://crowcpp.org/master/"
 language: c++
 primary_contact: "capuanobailey@gmail.com"
diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile
index d6cf1f4605a4..19f1f29bc5cd 100644
--- a/projects/cryptofuzz/Dockerfile
+++ b/projects/cryptofuzz/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-rust@sha256:c5216a9896a598dced7ce6708bb3226e443473f567045b4f282595776cc641f1
+FROM gcr.io/oss-fuzz-base/base-builder-rust:ubuntu-24-04@sha256:c5216a9896a598dced7ce6708bb3226e443473f567045b4f282595776cc641f1
 # ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-8bc8a5ea-9bfb-421d-bfe9-911828e88741.txt
 
 RUN apt-get update && \
diff --git a/projects/cryptofuzz/project.yaml b/projects/cryptofuzz/project.yaml
index 77668acbbd30..3d5b907bcb5f 100644
--- a/projects/cryptofuzz/project.yaml
+++ b/projects/cryptofuzz/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/guidovranken/cryptofuzz"
 language: c++
 primary_contact: "guidovranken@gmail.com"
diff --git a/projects/cryptography/Dockerfile b/projects/cryptography/Dockerfile
index 1857674710ae..65830ef99232 100644
--- a/projects/cryptography/Dockerfile
+++ b/projects/cryptography/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/pyca/cryptography
 RUN apt-get update
diff --git a/projects/cryptography/project.yaml b/projects/cryptography/project.yaml
index b03f59f0d46a..31d21701fc98 100644
--- a/projects/cryptography/project.yaml
+++ b/projects/cryptography/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 auto_ccs:
 - paul.l.kehrer@gmail.com
 fuzzing_engines:
diff --git a/projects/cryptsetup/Dockerfile b/projects/cryptsetup/Dockerfile
index 3b8163e01a5c..bfac65ccd141 100644
--- a/projects/cryptsetup/Dockerfile
+++ b/projects/cryptsetup/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://gitlab.com/cryptsetup/cryptsetup.git
 
diff --git a/projects/cryptsetup/project.yaml b/projects/cryptsetup/project.yaml
index c446c0e86eb9..40e2de66accc 100644
--- a/projects/cryptsetup/project.yaml
+++ b/projects/cryptsetup/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://gitlab.com/cryptsetup/cryptsetup"
 language: c
 builds_per_day: 2
diff --git a/projects/cssselect/Dockerfile b/projects/cssselect/Dockerfile
index 044eef07d882..4e78ef171418 100644
--- a/projects/cssselect/Dockerfile
+++ b/projects/cssselect/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/scrapy/cssselect cssselect
 COPY *.sh *py $SRC/
diff --git a/projects/cssselect/project.yaml b/projects/cssselect/project.yaml
index 25ad92b68c96..508bcd152fd2 100644
--- a/projects/cssselect/project.yaml
+++ b/projects/cssselect/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/scrapy/cssselect
 main_repo: https://github.com/scrapy/cssselect
 language: python
diff --git a/projects/cups-filters/Dockerfile b/projects/cups-filters/Dockerfile
index 8c4ff2b39d12..1e8f28ca2076 100644
--- a/projects/cups-filters/Dockerfile
+++ b/projects/cups-filters/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 build-essential 
 
 ### for cups-filters-2.x
diff --git a/projects/cups-filters/project.yaml b/projects/cups-filters/project.yaml
index 0ea5fbc651cc..b0c9b50e8331 100644
--- a/projects/cups-filters/project.yaml
+++ b/projects/cups-filters/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/OpenPrinting/cups-filters"
 main_repo: "https://github.com/OpenPrinting/cups-filters.git"
 # help_url:
diff --git a/projects/cups/Dockerfile b/projects/cups/Dockerfile
index 89462e2de4cb..7be3a2859365 100644
--- a/projects/cups/Dockerfile
+++ b/projects/cups/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 zlib1g-dev libavahi-client-dev libsystemd-dev
 RUN git clone --depth 1 https://github.com/OpenPrinting/cups
 RUN git clone --depth 1 https://github.com/OpenPrinting/fuzzing.git
diff --git a/projects/cups/project.yaml b/projects/cups/project.yaml
index 627adc6e5be9..180399f3bea3 100644
--- a/projects/cups/project.yaml
+++ b/projects/cups/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://openprinting.github.io/cups/"
 main_repo: 'https://github.com/OpenPrinting/cups'
 # help_url:
diff --git a/projects/curvesapi/Dockerfile b/projects/curvesapi/Dockerfile
index 7f3aa384518b..67a4813ae59d 100644
--- a/projects/curvesapi/Dockerfile
+++ b/projects/curvesapi/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/curvesapi/project.yaml b/projects/curvesapi/project.yaml
index 42fa8550617c..1a15e72cc22a 100644
--- a/projects/curvesapi/project.yaml
+++ b/projects/curvesapi/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/virtuald/curvesapi
 main_repo: https://github.com/virtuald/curvesapi
 language: jvm
diff --git a/projects/cxxopts/Dockerfile b/projects/cxxopts/Dockerfile
index c68a76e28368..17d1db1280f9 100644
--- a/projects/cxxopts/Dockerfile
+++ b/projects/cxxopts/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 update && apt install -y python3
 RUN git clone --depth 1 https://github.com/jarro2783/cxxopts.git cxxopts
 WORKDIR cxxopts
diff --git a/projects/cxxopts/project.yaml b/projects/cxxopts/project.yaml
index 59c87b09c4c6..559fe299e736 100644
--- a/projects/cxxopts/project.yaml
+++ b/projects/cxxopts/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/jarro2783/cxxopts"
 language: c++
 primary_contact: "jarro.2783@gmail.com"
diff --git a/projects/cyclonedds/Dockerfile b/projects/cyclonedds/Dockerfile
index cba1376d5d28..9f88b6a2c68d 100644
--- a/projects/cyclonedds/Dockerfile
+++ b/projects/cyclonedds/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 \
     autoconf \
     automake \
diff --git a/projects/cyclonedds/project.yaml b/projects/cyclonedds/project.yaml
index 8bb114a9af8b..d7711222e05e 100644
--- a/projects/cyclonedds/project.yaml
+++ b/projects/cyclonedds/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://projects.eclipse.org/projects/iot.cyclonedds"
 language: c
 auto_ccs:
diff --git a/projects/d3/Dockerfile b/projects/d3/Dockerfile
index ee58fc4216ce..b4fa6556b81e 100644
--- a/projects/d3/Dockerfile
+++ b/projects/d3/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/d3/project.yaml b/projects/d3/project.yaml
index 607f9bc55754..2ca5d40c8b24 100644
--- a/projects/d3/project.yaml
+++ b/projects/d3/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://d3js.org/
 language: javascript
 main_repo: https://github.com/d3/d3.git
diff --git a/projects/dask/Dockerfile b/projects/dask/Dockerfile
index 602e9e226333..584806378851 100644
--- a/projects/dask/Dockerfile
+++ b/projects/dask/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 pkg-config
 RUN git clone https://github.com/dask/dask
 COPY build.sh fuzz_fuse.py $SRC/
diff --git a/projects/dask/project.yaml b/projects/dask/project.yaml
index 376f2950fc0b..602891c206bf 100644
--- a/projects/dask/project.yaml
+++ b/projects/dask/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/dask/dask
diff --git a/projects/data-encoding/Dockerfile b/projects/data-encoding/Dockerfile
index 24d8f006d9b6..9eeafc6baabc 100644
--- a/projects/data-encoding/Dockerfile
+++ b/projects/data-encoding/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
 
diff --git a/projects/data-encoding/project.yaml b/projects/data-encoding/project.yaml
index 826c05aa2752..14e30cddbf62 100644
--- a/projects/data-encoding/project.yaml
+++ b/projects/data-encoding/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ia0/data-encoding"
 main_repo: "https://github.com/ia0/data-encoding.git"
 sanitizers:
diff --git a/projects/dateparser/Dockerfile b/projects/dateparser/Dockerfile
index e05e4ac12e3f..f44608a4b38f 100644
--- a/projects/dateparser/Dockerfile
+++ b/projects/dateparser/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 git clone --depth 1 https://github.com/scrapinghub/dateparser.git dateparser \
         && cp dateparser/fuzzing/build.sh $SRC/ \
diff --git a/projects/dateparser/project.yaml b/projects/dateparser/project.yaml
index 6b773bf6da65..98c1536bfdad 100644
--- a/projects/dateparser/project.yaml
+++ b/projects/dateparser/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://dateparser.readthedocs.io/en/latest/"
 language: python
 primary_contact: "opensource@zyte.com"
diff --git a/projects/dav1d/Dockerfile b/projects/dav1d/Dockerfile
index e7f869bab838..cb6d5945df9d 100644
--- a/projects/dav1d/Dockerfile
+++ b/projects/dav1d/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 --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel nasm && \
     pip3 install meson ninja
diff --git a/projects/dav1d/project.yaml b/projects/dav1d/project.yaml
index 8c12d1882393..af9cc4fef37d 100644
--- a/projects/dav1d/project.yaml
+++ b/projects/dav1d/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://code.videolan.org/videolan/dav1d"
 language: c++
 primary_contact: "janne.grunau@gmail.com"
diff --git a/projects/dbus-broker/Dockerfile b/projects/dbus-broker/Dockerfile
index baa60f0d872f..91d5d0b6fd34 100644
--- a/projects/dbus-broker/Dockerfile
+++ b/projects/dbus-broker/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/bus1/dbus-broker
 RUN cargo install bindgen-cli
 WORKDIR dbus-broker
diff --git a/projects/dbus-broker/project.yaml b/projects/dbus-broker/project.yaml
index 727831b4bb04..72453fba27b9 100644
--- a/projects/dbus-broker/project.yaml
+++ b/projects/dbus-broker/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/bus1/dbus-broker"
 language: c
 primary_contact: "david.rheinsberg@gmail.com"
diff --git a/projects/decorator/Dockerfile b/projects/decorator/Dockerfile
index a2816f811401..2d909d3f3fef 100644
--- a/projects/decorator/Dockerfile
+++ b/projects/decorator/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/micheles/decorator
 WORKDIR decorator
diff --git a/projects/decorator/project.yaml b/projects/decorator/project.yaml
index 3e98d4066e43..bdc4dbf372a5 100644
--- a/projects/decorator/project.yaml
+++ b/projects/decorator/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/micheles/decorator
diff --git a/projects/defusedxml/Dockerfile b/projects/defusedxml/Dockerfile
index 244f0ea97675..bb42ff50f94d 100644
--- a/projects/defusedxml/Dockerfile
+++ b/projects/defusedxml/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/tiran/defusedxml defusedxml
 COPY *.sh *py $SRC/
diff --git a/projects/defusedxml/project.yaml b/projects/defusedxml/project.yaml
index 971aadbe5016..a267a315e26e 100644
--- a/projects/defusedxml/project.yaml
+++ b/projects/defusedxml/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/tiran/defusedxml
 main_repo: https://github.com/tiran/defusedxml
 language: python
diff --git a/projects/demangle/Dockerfile b/projects/demangle/Dockerfile
index 7f90867ba72f..759868668fb3 100644
--- a/projects/demangle/Dockerfile
+++ b/projects/demangle/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/ianlancetaylor/demangle
 WORKDIR $SRC/demangle
 COPY build.sh fuzz_test.go $SRC/
diff --git a/projects/demangle/project.yaml b/projects/demangle/project.yaml
index 7e0d551b62d2..3051264ef4fd 100644
--- a/projects/demangle/project.yaml
+++ b/projects/demangle/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/ianlancetaylor/demangle"
 language: go
 main_repo: "https://github.com/ianlancetaylor/demangle"
diff --git a/projects/dill/Dockerfile b/projects/dill/Dockerfile
index 234d696f8cb2..40e092e7118b 100644
--- a/projects/dill/Dockerfile
+++ b/projects/dill/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 pip3 install --upgrade pip
 RUN git clone https://github.com/uqfoundation/dill dill
 COPY *.sh *py $SRC/
diff --git a/projects/dill/project.yaml b/projects/dill/project.yaml
index 7594d57e4e56..accaa7119558 100644
--- a/projects/dill/project.yaml
+++ b/projects/dill/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/uqfoundation/dill
 main_repo: https://github.com/uqfoundation/dill
 language: python
diff --git a/projects/distlib/Dockerfile b/projects/distlib/Dockerfile
index bb0d01eba798..cedf9cfdd110 100644
--- a/projects/distlib/Dockerfile
+++ b/projects/distlib/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/pypa/distlib distlib
 COPY *.sh *py $SRC/
 WORKDIR $SRC/distlib
diff --git a/projects/distlib/project.yaml b/projects/distlib/project.yaml
index 86370e70052b..2a0a0f53720e 100644
--- a/projects/distlib/project.yaml
+++ b/projects/distlib/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/pypa/distlib
diff --git a/projects/distribution/Dockerfile b/projects/distribution/Dockerfile
index 23a80d1efaf7..b28eb114904e 100644
--- a/projects/distribution/Dockerfile
+++ b/projects/distribution/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/distribution/distribution
 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=november-backup
diff --git a/projects/distribution/project.yaml b/projects/distribution/project.yaml
index 294381c6bd6d..c856f0161fc7 100644
--- a/projects/distribution/project.yaml
+++ b/projects/distribution/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/distribution/distribution"
 main_repo: "https://github.com/distribution/distribution"
 primary_contact: "cncf-distribution-security@lists.cncf.io"
diff --git a/projects/django/Dockerfile b/projects/django/Dockerfile
index 35593e91f505..851f3c838fe6 100644
--- a/projects/django/Dockerfile
+++ b/projects/django/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 python3 -m pip install cython
 RUN git clone --depth 1 https://github.com/django/django.git
diff --git a/projects/django/project.yaml b/projects/django/project.yaml
index 7a0eecbc78d9..bc82ddc01f3e 100644
--- a/projects/django/project.yaml
+++ b/projects/django/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 auto_ccs:
 - jammamarkus@gmail.com
 - guidovranken@gmail.com
diff --git a/projects/dng_sdk/Dockerfile b/projects/dng_sdk/Dockerfile
index 9913ba8b572b..d44aabc1e12f 100644
--- a/projects/dng_sdk/Dockerfile
+++ b/projects/dng_sdk/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 wget cmake libjpeg-turbo8-dev zlib1g-dev libxmp-dev
 RUN git clone https://android.googlesource.com/platform/external/dng_sdk/
 
diff --git a/projects/dng_sdk/project.yaml b/projects/dng_sdk/project.yaml
index 8503b6022ee5..1e6d87647d7c 100644
--- a/projects/dng_sdk/project.yaml
+++ b/projects/dng_sdk/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://android.googlesource.com/platform/external/dng_sdk/"
 language: c++
 primary_contact: "adaubert@google.com"
diff --git a/projects/dnsmasq/Dockerfile b/projects/dnsmasq/Dockerfile
index 6ab50ce2fce6..f6fbb8046099 100644
--- a/projects/dnsmasq/Dockerfile
+++ b/projects/dnsmasq/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 git://thekelleys.org.uk/dnsmasq.git dnsmasq    
 WORKDIR dnsmasq
diff --git a/projects/dnsmasq/project.yaml b/projects/dnsmasq/project.yaml
index 1997d6de1e73..9aaa97a2adb5 100644
--- a/projects/dnsmasq/project.yaml
+++ b/projects/dnsmasq/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://thekelleys.org.uk/dnsmasq/doc.html"
 language: c
 primary_contact: "simon@thekelleys.org.uk"
diff --git a/projects/dnspython/Dockerfile b/projects/dnspython/Dockerfile
index f5a9f4fcea8e..4afdc33b6cc9 100644
--- a/projects/dnspython/Dockerfile
+++ b/projects/dnspython/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/rthalley/dnspython dnspython
 COPY *.sh *py $SRC/
 WORKDIR $SRC/dnspython
diff --git a/projects/dnspython/project.yaml b/projects/dnspython/project.yaml
index e476bcf73a21..377b7b574c85 100644
--- a/projects/dnspython/project.yaml
+++ b/projects/dnspython/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/rthalley/dnspython
diff --git a/projects/docker-client/Dockerfile b/projects/docker-client/Dockerfile
index b1de5e20178a..37d23135ab84 100644
--- a/projects/docker-client/Dockerfile
+++ b/projects/docker-client/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 && \
     rm -rf maven.zip
diff --git a/projects/docker-client/project.yaml b/projects/docker-client/project.yaml
index 52b012aafe0e..4b287ab005a9 100644
--- a/projects/docker-client/project.yaml
+++ b/projects/docker-client/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/spotify/docker-client
 main_repo: https://github.com/spotify/docker-client
 language: jvm
diff --git a/projects/docutils/Dockerfile b/projects/docutils/Dockerfile
index 57d91ab8165e..a95f5a47a2d9 100644
--- a/projects/docutils/Dockerfile
+++ b/projects/docutils/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/jwilk-mirrors/docutils docutils
 COPY *.sh *py $SRC/
 WORKDIR $SRC/docutils
diff --git a/projects/docutils/project.yaml b/projects/docutils/project.yaml
index 5a753ab667b1..63d78aa3a7b5 100644
--- a/projects/docutils/project.yaml
+++ b/projects/docutils/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/jwilk-mirrors/docutils
diff --git a/projects/dom4j/Dockerfile b/projects/dom4j/Dockerfile
index 5d4f67af531e..7e51a4894873 100644
--- a/projects/dom4j/Dockerfile
+++ b/projects/dom4j/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
 
 # Ensure Java 11 is installed
 RUN apt-get update && \
diff --git a/projects/dom4j/project.yaml b/projects/dom4j/project.yaml
index 18121542d238..f9a642645a83 100644
--- a/projects/dom4j/project.yaml
+++ b/projects/dom4j/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/dom4j/dom4j"
 language: jvm
 main_repo: "https://github.com/dom4j/dom4j.git"
diff --git a/projects/double-conversion/Dockerfile b/projects/double-conversion/Dockerfile
index ef72bebaf764..239524ee0cfd 100644
--- a/projects/double-conversion/Dockerfile
+++ b/projects/double-conversion/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 \
diff --git a/projects/double-conversion/project.yaml b/projects/double-conversion/project.yaml
index ff0dece10b12..fa1b6d1a0ecd 100644
--- a/projects/double-conversion/project.yaml
+++ b/projects/double-conversion/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/google/double-conversion"
 language: c++
 primary_contact: "florian@loitsch.com"
diff --git a/projects/dovecot/Dockerfile b/projects/dovecot/Dockerfile
index 253230b576ba..5640d6f23c3f 100755
--- a/projects/dovecot/Dockerfile
+++ b/projects/dovecot/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 gettext automake libxml2-dev m4 pkg-config bison flex python3.8-venv libssl-dev zlib1g-dev
 RUN git clone --depth 1 https://github.com/dovecot/core dovecot
 WORKDIR dovecot
diff --git a/projects/dovecot/project.yaml b/projects/dovecot/project.yaml
index 3c71d55472f3..55015aed50cd 100755
--- a/projects/dovecot/project.yaml
+++ b/projects/dovecot/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.dovecot.org/"
 language: c
 primary_contact: "oss-fuzz@open-xchange.com"
diff --git a/projects/draco/Dockerfile b/projects/draco/Dockerfile
index 772ae6d2e80c..449d9c6663f2 100644
--- a/projects/draco/Dockerfile
+++ b/projects/draco/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 git cmake make pkg-config
 RUN git clone --depth 1 https://github.com/google/draco draco
 COPY build.sh $SRC/
diff --git a/projects/draco/project.yaml b/projects/draco/project.yaml
index b1d007e07302..683c7f83b7b2 100644
--- a/projects/draco/project.yaml
+++ b/projects/draco/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/google/draco"
 language: c++
 primary_contact: "fgalligan@google.com"
diff --git a/projects/dropbear/Dockerfile b/projects/dropbear/Dockerfile
index f2c235486c8c..b28964b80287 100644
--- a/projects/dropbear/Dockerfile
+++ b/projects/dropbear/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 autoconf mercurial
 RUN hg clone https://hg.ucc.asn.au/dropbear-fuzzcorpus dropbear-corpus
 RUN git clone https://github.com/mkj/dropbear dropbear
diff --git a/projects/dropbear/project.yaml b/projects/dropbear/project.yaml
index 78ee9009f7a4..853b1719db8e 100644
--- a/projects/dropbear/project.yaml
+++ b/projects/dropbear/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://matt.ucc.asn.au/dropbear/dropbear.html"
 language: c++
 primary_contact: "matt@ucc.asn.au"
diff --git a/projects/dropwizard/Dockerfile b/projects/dropwizard/Dockerfile
index 93cbb2f90afe..0f9468fb463b 100644
--- a/projects/dropwizard/Dockerfile
+++ b/projects/dropwizard/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/dropwizard/project.yaml b/projects/dropwizard/project.yaml
index eaa662287251..834580854a0d 100644
--- a/projects/dropwizard/project.yaml
+++ b/projects/dropwizard/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/dropwizard/dropwizard
 main_repo: https://github.com/dropwizard/dropwizard
 language: jvm
diff --git a/projects/duckdb/Dockerfile b/projects/duckdb/Dockerfile
index 4b35176c671f..6e97bc86fa89 100644
--- a/projects/duckdb/Dockerfile
+++ b/projects/duckdb/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/duckdb/duckdb duckdb
 WORKDIR duckdb
 COPY build.sh $SRC/
diff --git a/projects/duckdb/project.yaml b/projects/duckdb/project.yaml
index 4b9c9984e630..8c096cc0477c 100644
--- a/projects/duckdb/project.yaml
+++ b/projects/duckdb/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://duckdb.org/"
 language: c++
 primary_contact: "quack@duckdb.org"
diff --git a/projects/e2fsprogs/Dockerfile b/projects/e2fsprogs/Dockerfile
index 484525ba6685..1faf4652d710 100644
--- a/projects/e2fsprogs/Dockerfile
+++ b/projects/e2fsprogs/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 --allow-downgrades --allow-remove-essential --allow-change-held-packages git make texinfo
 RUN git clone --depth 1 https://github.com/tytso/e2fsprogs
 
diff --git a/projects/e2fsprogs/project.yaml b/projects/e2fsprogs/project.yaml
index 4558ff33b8c3..90c31d47b8e8 100644
--- a/projects/e2fsprogs/project.yaml
+++ b/projects/e2fsprogs/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/tytso/e2fsprogs"
 language: c
 primary_contact: "tytso@mit.edu"
diff --git a/projects/easywsclient/Dockerfile b/projects/easywsclient/Dockerfile
index 5f0cbf12d564..f7bf4c134dad 100644
--- a/projects/easywsclient/Dockerfile
+++ b/projects/easywsclient/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/dhbaird/easywsclient easywsclient
 WORKDIR easywsclient
diff --git a/projects/easywsclient/project.yaml b/projects/easywsclient/project.yaml
index 439c17c7b6ff..42d38308f202 100644
--- a/projects/easywsclient/project.yaml
+++ b/projects/easywsclient/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/dhbaird/easywsclient"
 language: c++
 primary_contact: "dhbaird@gmail.com"
diff --git a/projects/ecc-diff-fuzzer/Dockerfile b/projects/ecc-diff-fuzzer/Dockerfile
index 4cf03a7144f2..d446991f736c 100644
--- a/projects/ecc-diff-fuzzer/Dockerfile
+++ b/projects/ecc-diff-fuzzer/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
 ENV GOPATH /root/go
 ENV PATH $PATH:/root/.go/bin:$GOPATH/bin
 RUN install_go.sh
diff --git a/projects/ecc-diff-fuzzer/project.yaml b/projects/ecc-diff-fuzzer/project.yaml
index bb7413709078..f18c2e86379e 100644
--- a/projects/ecc-diff-fuzzer/project.yaml
+++ b/projects/ecc-diff-fuzzer/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/catenacyber/elliptic-curve-differential-fuzzer"
 language: c++
 primary_contact: "p.antoine@catenacyber.fr"
diff --git a/projects/ecdsa-python/Dockerfile b/projects/ecdsa-python/Dockerfile
index 7aac78872b44..717c6476ddf3 100644
--- a/projects/ecdsa-python/Dockerfile
+++ b/projects/ecdsa-python/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/starkbank/ecdsa-python/
 WORKDIR $SRC
 COPY build.sh $SRC/
diff --git a/projects/ecdsa-python/project.yaml b/projects/ecdsa-python/project.yaml
index 1dcd9e07f3b4..014585f3e9cf 100644
--- a/projects/ecdsa-python/project.yaml
+++ b/projects/ecdsa-python/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/starkbank/ecdsa-python
diff --git a/projects/eclipse-equinox/Dockerfile b/projects/eclipse-equinox/Dockerfile
index c96ee0eafb6a..b98edfeccfd7 100644
--- a/projects/eclipse-equinox/Dockerfile
+++ b/projects/eclipse-equinox/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 maven configuration, which is also used by gradles's publishToMavenLocal
diff --git a/projects/eclipse-equinox/project.yaml b/projects/eclipse-equinox/project.yaml
index 35610d1b7dbf..a289bf22e3f7 100644
--- a/projects/eclipse-equinox/project.yaml
+++ b/projects/eclipse-equinox/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/eclipse-equinox/equinox"
 language: jvm
 main_repo: "https://github.com/eclipse-equinox/equinox"
diff --git a/projects/edk2/Dockerfile b/projects/edk2/Dockerfile
index 68aba274a3a4..4484e75ea72a 100644
--- a/projects/edk2/Dockerfile
+++ b/projects/edk2/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 nasm uuid-dev
diff --git a/projects/edk2/project.yaml b/projects/edk2/project.yaml
index d433b4b45946..e1128074e3b4 100644
--- a/projects/edk2/project.yaml
+++ b/projects/edk2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.tianocore.org"
 language: c
 fuzzing_engines:
diff --git a/projects/eigen/Dockerfile b/projects/eigen/Dockerfile
index 59f9c6550365..16ca0fc3da9b 100644
--- a/projects/eigen/Dockerfile
+++ b/projects/eigen/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 --yes cmake mercurial
 RUN git clone https://gitlab.com/libeigen/eigen.git
 WORKDIR eigen
diff --git a/projects/eigen/project.yaml b/projects/eigen/project.yaml
index b64d68b18095..66fddeb617eb 100644
--- a/projects/eigen/project.yaml
+++ b/projects/eigen/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "http://eigen.tuxfamily.org/index.php?title=Main_Page"
 language: c++
 primary_contact: "eigen-core-team@lists.tuxfamily.org"
diff --git a/projects/elfutils/Dockerfile b/projects/elfutils/Dockerfile
index 8f5a3b798c80..ad7d24b98e0a 100644
--- a/projects/elfutils/Dockerfile
+++ b/projects/elfutils/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 autopoint zlib1g-dev zlib1g-dev:i386 flex gawk bison
 RUN git clone --depth 1 https://sourceware.org/git/elfutils.git
diff --git a/projects/elfutils/project.yaml b/projects/elfutils/project.yaml
index 9ab4229966a2..e5491addef5e 100644
--- a/projects/elfutils/project.yaml
+++ b/projects/elfutils/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://sourceware.org/elfutils/"
 language: c++
 builds_per_day: 4
diff --git a/projects/envoy/Dockerfile b/projects/envoy/Dockerfile
index ab5d3b844590..e4297dbc3a4f 100644
--- a/projects/envoy/Dockerfile
+++ b/projects/envoy/Dockerfile
@@ -15,7 +15,7 @@
 ################################################################################
 
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:56905c98ae0083d14da0e7371184e694560a74750533f321ac0e9145af0e8d2e
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04@sha256:56905c98ae0083d14da0e7371184e694560a74750533f321ac0e9145af0e8d2e
 # ! 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
 # see https://github.com/google/oss-fuzz/pull/12365
 
diff --git a/projects/envoy/project.yaml b/projects/envoy/project.yaml
index 5bc0c47bc9ea..c37c917bc3ac 100644
--- a/projects/envoy/project.yaml
+++ b/projects/envoy/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://www.envoyproxy.io/"
 language: c++
 primary_contact: "htuch@google.com"
diff --git a/projects/esp-v2/Dockerfile b/projects/esp-v2/Dockerfile
index 0e5a2969410a..fbc6eb32ea64 100644
--- a/projects/esp-v2/Dockerfile
+++ b/projects/esp-v2/Dockerfile
@@ -16,7 +16,7 @@
 
 ## This file was copied from envoy (with minor changes).
 
-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/esp-v2/project.yaml b/projects/esp-v2/project.yaml
index 86c3042be161..020eb0717f42 100644
--- a/projects/esp-v2/project.yaml
+++ b/projects/esp-v2/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/GoogleCloudPlatform/esp-v2"
 language: c++
 primary_contact: "nareddyt@google.com"
diff --git a/projects/espeak-ng/Dockerfile b/projects/espeak-ng/Dockerfile
index 674c629ca6f3..e3e745607c06 100644
--- a/projects/espeak-ng/Dockerfile
+++ b/projects/espeak-ng/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 automake autoconf libtool pkg-config
 RUN git clone --depth 1 https://github.com/espeak-ng/espeak-ng
 COPY build.sh $SRC
diff --git a/projects/espeak-ng/project.yaml b/projects/espeak-ng/project.yaml
index 142a78de502e..28297bc72caa 100644
--- a/projects/espeak-ng/project.yaml
+++ b/projects/espeak-ng/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://github.com/espeak-ng/espeak-ng"
 language: c++
 primary_contact: "msclrhd@googlemail.com"
diff --git a/projects/et-xmlfile/Dockerfile b/projects/et-xmlfile/Dockerfile
index 57ddc9af1b2c..31a044c51cb4 100644
--- a/projects/et-xmlfile/Dockerfile
+++ b/projects/et-xmlfile/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/lxml/lxml
 RUN apt-get install -y libxml2-dev libxslt-dev zlib1g-dev
diff --git a/projects/et-xmlfile/project.yaml b/projects/et-xmlfile/project.yaml
index dddf631e9a20..3480e7d8a661 100644
--- a/projects/et-xmlfile/project.yaml
+++ b/projects/et-xmlfile/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 fuzzing_engines:
 - libfuzzer
 homepage: https://github.com/biydnd/et_xmlfile
diff --git a/projects/etcd/Dockerfile b/projects/etcd/Dockerfile
index c69c26832bc3..c5aafeb52ad8 100644
--- a/projects/etcd/Dockerfile
+++ b/projects/etcd/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/etcd-io/etcd
 RUN git clone --depth 1 https://github.com/etcd-io/raft
 RUN git clone --depth 1 https://github.com/cncf/cncf-fuzzing
diff --git a/projects/etcd/project.yaml b/projects/etcd/project.yaml
index e8309892c8bf..b2ba391a6f86 100644
--- a/projects/etcd/project.yaml
+++ b/projects/etcd/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: "https://etcd.io"
 main_repo: "https://github.com/etcd-io/etcd"
 primary_contact: "ptab@google.com"
diff --git a/projects/evo-inflector/Dockerfile b/projects/evo-inflector/Dockerfile
index f366332a3685..4af0bc00791e 100644
--- a/projects/evo-inflector/Dockerfile
+++ b/projects/evo-inflector/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/evo-inflector/project.yaml b/projects/evo-inflector/project.yaml
index 1c7a62f3271f..088ff03e400e 100644
--- a/projects/evo-inflector/project.yaml
+++ b/projects/evo-inflector/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 homepage: https://github.com/atteo/evo-inflector
 main_repo: https://github.com/atteo/evo-inflector
 language: jvm
diff --git a/projects/example/Dockerfile b/projects/example/Dockerfile
index 6452d322fdde..2b348d5f2bc8 100644
--- a/projects/example/Dockerfile
+++ b/projects/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
 RUN apt-get update && apt-get install -y make
 
 # Get *your* source code here.
diff --git a/projects/example/project.yaml b/projects/example/project.yaml
index 5bc33721c6e5..99b5d84c5cda 100644
--- a/projects/example/project.yaml
+++ b/projects/example/project.yaml
@@ -1,3 +1,4 @@
+base_os_version: ubuntu-24-04
 disabled: true
 homepage: https://my-api.example.com
 main_repo: https://github.com/example/my-api