diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index f9e89c80435fe..86a2c3a9502d4 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -91,11 +91,11 @@ RUN sudo apt-get update \
         make \
         python3 \
         python3-dev \
-        python3-distutils \
         python3-packaging \
+        python3-setuptools \
         python3-psutil \
         software-properties-common \
-        swig4.0 \
+        swig \
         unzip \
         uuid-dev \
         wget \
@@ -290,6 +290,3 @@ FROM builder-base AS actions-builder
 
 WORKDIR /home/runner
 USER runner
-
-
-
diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 28140038725d5..df5df8ce907f1 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 
 x-versions: &compiler_versions
-  GCC_LATEST_VERSION: 13
+  GCC_LATEST_VERSION: 14
   LLVM_HEAD_VERSION: 19
 
 services:
@@ -12,7 +12,7 @@ services:
       dockerfile: Dockerfile
       target: buildkite-builder
       args:
-        BASE_IMAGE: ubuntu:jammy
+        BASE_IMAGE: ubuntu:noble
         <<: *compiler_versions
   actions-builder:
     image: ghcr.io/libcxx/actions-builder:${TAG:-latest}
@@ -30,9 +30,8 @@ services:
       dockerfile: Dockerfile
       target: android-buildkite-builder
       args:
-        BASE_IMAGE: ubuntu:jammy
+        BASE_IMAGE: ubuntu:noble
         ANDROID_CLANG_VERSION: r498229b
         ANDROID_CLANG_PREBUILTS_COMMIT: 5186d132c99aa75dc25207c392e3ea5b93d0107e
         ANDROID_SYSROOT_BID: 10957860
         <<: *compiler_versions
-