diff --git a/.gitlab-ci/container/build-android-x86_64-llvm.sh b/.gitlab-ci/container/build-android-x86_64-llvm.sh
index b3c62eac9bd..d59cae1b383 100755
--- a/.gitlab-ci/container/build-android-x86_64-llvm.sh
+++ b/.gitlab-ci/container/build-android-x86_64-llvm.sh
@@ -26,13 +26,17 @@ if [ -n "$CI" ] && [ ! -s "${S3_JWT_FILE}" ]; then
   exit 1
 fi
 
-if curl -s -o /dev/null -I -L -f --retry 4 --retry-delay 15 "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${S3_PROJECT_PATH}/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"; then
+# shellcheck disable=SC2034 # S3_BASE_PATH is used in find_s3_project_artifact
+S3_BASE_PATH="${S3_HOST}/${S3_ANDROID_BUCKET}"
+ARTIFACTS_PATH="${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
+
+if ARTIFACTS_URL="$(find_s3_project_artifact "${ARTIFACTS_PATH}")"; then
   echo "Artifact ${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst already exists, skip re-building."
 
   # Download prebuilt LLVM libraries for Android when they have not changed,
   # to save some time
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${S3_PROJECT_PATH}/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
+    -o "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "${ARTIFACTS_URL}"
   tar -C / --zstd -xf "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
   rm "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
 
diff --git a/.gitlab-ci/container/debian/gitlab-ci.yml b/.gitlab-ci/container/debian/gitlab-ci.yml
index 594719ef966..dc50b996af5 100644
--- a/.gitlab-ci/container/debian/gitlab-ci.yml
+++ b/.gitlab-ci/container/debian/gitlab-ci.yml
@@ -152,7 +152,7 @@ debian/s390x_build:
     ANDROID_NDK_VERSION: "r27c"
     ANDROID_SDK_VERSION: 34
     ANDROID_LLVM_VERSION: llvmorg-19.1.7
-    ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250324
+    ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250822
     # 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 1132abdc7c2..a20ae4e1904 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -20,7 +20,7 @@ include:
 
 variables:
   DEBIAN_BUILD_BASE_TAG: "20250818-s3url"
-  DEBIAN_BUILD_TAG: "20250819-arustvk"
+  DEBIAN_BUILD_TAG: "20250825-finds3"
 
   DEBIAN_TEST_BASE_TAG: "20250818-s3url"
   DEBIAN_TEST_ANDROID_TAG: "20250821-angle"