diff --git a/infra/base-images/base-builder/install_swift_ubuntu-24-04.sh b/infra/base-images/base-builder/install_swift_ubuntu-24-04.sh
index d3b1c0beac87..df8023275b25 100755
--- a/infra/base-images/base-builder/install_swift_ubuntu-24-04.sh
+++ b/infra/base-images/base-builder/install_swift_ubuntu-24-04.sh
@@ -19,29 +19,30 @@
 source /etc/os-release
 
 if [[ "$VERSION_ID" == "20.04" ]]; then
-  SWIFT_PACKAGES="wget \
-            binutils \
+  SWIFT_PACKAGES="binutils \
             git \
+            unzip \
             gnupg2 \
             libc6-dev \
-            libcurl4 \
+            libcurl4-openssl-dev \
             libedit2 \
-            libgcc-9-dev \
-            libpython2.7 \
+            libgcc-11-dev \
+            libpython3-dev \
             libsqlite3-0 \
-            libstdc++-9-dev \
-            libxml2 \
+            libstdc++-11-dev \
+            libxml2-dev \
             libz3-dev \
             pkg-config \
+            python3-lldb-13 \
             tzdata \
             uuid-dev \
             zlib1g-dev"
   SWIFT_URL="https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz"
   SWIFT_DIR="swift-6.1.3-RELEASE-ubuntu20_04"
 elif [[ "$VERSION_ID" == "24.04" ]]; then
-  SWIFT_PACKAGES="wget \
-            binutils \
+  SWIFT_PACKAGES="binutils \
             git \
+            unzip \
             gnupg2 \
             libc6-dev \
             libcurl4-openssl-dev \
@@ -58,8 +59,8 @@ elif [[ "$VERSION_ID" == "24.04" ]]; then
             zip \
             unzip \
             zlib1g-dev"
-  SWIFT_URL="https://download.swift.org/swift-6.1.3-release/ubuntu2404/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu24.04.tar.gz"
-  SWIFT_DIR="swift-6.1.3-RELEASE-ubuntu24.04"
+  SWIFT_URL="https://download.swift.org/swift-6.2.3-release/ubuntu2404/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE-ubuntu24.04.tar.gz"
+  SWIFT_DIR="swift-6.2.3-RELEASE-ubuntu24.04"
 else
   echo "Unsupported Ubuntu version: $VERSION_ID"
   exit 1
diff --git a/projects/grpc-swift/Dockerfile b/projects/grpc-swift/Dockerfile
index 981ebe9d2ae2..55c4274a2517 100644
--- a/projects/grpc-swift/Dockerfile
+++ b/projects/grpc-swift/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-swift
+FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
 
 # specific to project
 RUN apt-get update && apt-get install -y zlib1g-dev
diff --git a/projects/grpc-swift/project.yaml b/projects/grpc-swift/project.yaml
index 2b5c23049487..2e54fad15d7b 100644
--- a/projects/grpc-swift/project.yaml
+++ b/projects/grpc-swift/project.yaml
@@ -11,3 +11,4 @@ sanitizers:
 - address
 - thread
 main_repo: 'https://github.com/grpc/grpc-swift'
+base_os_version: ubuntu-24-04
diff --git a/projects/swift-nio/Dockerfile b/projects/swift-nio/Dockerfile
index 1e47174c06b5..66e59a249a0c 100644
--- a/projects/swift-nio/Dockerfile
+++ b/projects/swift-nio/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-swift
+FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
 
 # specific swift-nio
 RUN git clone --depth 1 https://github.com/google/fuzzing
diff --git a/projects/swift-nio/project.yaml b/projects/swift-nio/project.yaml
index 6c9a01ddc550..1274bb07e8cd 100644
--- a/projects/swift-nio/project.yaml
+++ b/projects/swift-nio/project.yaml
@@ -12,3 +12,4 @@ sanitizers:
 - address
 - thread
 main_repo: 'https://github.com/apple/swift-nio.git'
+base_os_version: ubuntu-24-04
diff --git a/projects/swift-protobuf/Dockerfile b/projects/swift-protobuf/Dockerfile
index 6c4634262f22..b429dcd30a14 100644
--- a/projects/swift-protobuf/Dockerfile
+++ b/projects/swift-protobuf/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-swift
+FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
 
 RUN git clone --depth 1 --recurse-submodules --shallow-submodules https://github.com/apple/swift-protobuf.git
 COPY build.sh $SRC
diff --git a/projects/swift-protobuf/project.yaml b/projects/swift-protobuf/project.yaml
index 27b9da693c12..e772007ee57d 100644
--- a/projects/swift-protobuf/project.yaml
+++ b/projects/swift-protobuf/project.yaml
@@ -15,3 +15,4 @@ coverage_extra_args: >
   -ignore-filename-regex=.*\.pb\.swift
   -ignore-filename-regex=.*/\.build/.*
 main_repo: 'https://github.com/apple/swift-protobuf.git'
+base_os_version: ubuntu-24-04