diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 36b8dd77c47fb..ccaee8c896ded 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -1,6 +1,10 @@
 x-versions: &compiler_versions
   GCC_HEAD_VERSION: 16
-  LLVM_HEAD_VERSION: 21
+  LLVM_HEAD_VERSION: 22
+
+x-image-versions: &image_versions
+  BASE_IMAGE: ubuntu:jammy
+  ACTIONS_BASE_IMAGE: builder-base
 
 services:
   builder-base:
@@ -10,8 +14,7 @@ services:
       dockerfile: Dockerfile
       target: builder-base
       args:
-        BASE_IMAGE: ubuntu:jammy
-        <<: *compiler_versions
+        <<: [*image_versions, *compiler_versions]
 
   actions-builder:
     image: ghcr.io/llvm/libcxx-linux-builder:${TAG}
@@ -20,10 +23,8 @@ services:
       dockerfile: Dockerfile
       target: actions-builder
       args:
-        BASE_IMAGE: ubuntu:jammy
-        ACTIONS_BASE_IMAGE: builder-base
         GITHUB_RUNNER_VERSION: "2.326.0"
-        <<: *compiler_versions
+        <<: [*image_versions, *compiler_versions]
 
   android-buildkite-builder:
     image: ghcr.io/llvm/libcxx-android-builder:${TAG}