diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index d85656c74e7..d31b74a5131 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -198,8 +198,8 @@ debian/s390x_build:
     ANDROID_SDK_VERSION: 34
     # Space-separated list of interesting CTS modules
     ANDROID_CTS_MODULES: CtsGraphicsTestCases
-    ANDROID_LLVM_VERSION: llvmorg-18.1.8
-    ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250103
+    ANDROID_LLVM_VERSION: llvmorg-19.1.7
+    ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250324
     # This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
     # used (LLVM 19 in our Debian system), but ANDROID_LLVM_VERSION refers to
     # the cross-compiling LLVM toolchain used to build for the Android system.
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index bd2785221f3..3ef350ca1c4 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,7 +23,7 @@ variables:
    DEBIAN_BASE_TAG: "20250321-s3cp-fix5"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20250321-s3cp-fix5"
+   DEBIAN_BUILD_TAG: "20250324-android"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM32_TEST_BASE_IMAGE: "debian/arm32_test-base"