diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index 2c962ed0f61..35abe1ac27b 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,3 +1,3 @@
 variables:
-  CONDITIONAL_BUILD_ANGLE_TAG: be4f59328ef607bcbf5048a3f6f27410
+  CONDITIONAL_BUILD_ANGLE_TAG: 384145a4023315dae658259bee07c43a
   CONDITIONAL_BUILD_PIGLIT_TAG: a19e424b8a3f020dbf1b9dd29f220a4f
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 1e03e8390cf..e6dd7882c3e 100755
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -14,6 +14,7 @@ section_start angle "Building ANGLE"
 ci_tag_build_time_check "ANGLE_TAG"
 
 ANGLE_REV="f355e2b37ed43939e2753fc7dacccf75abb4c1a3"
+DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
 if [[ -z "${ANGLE_ARCH:-}" ]]; then
@@ -24,9 +25,15 @@ if [[ -z "${ANGLE_ARCH:-}" ]]; then
 fi
 
 # DEPOT tools
-git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot-tools
+mkdir /depot-tools
+pushd /depot-tools
+git init
+git remote add origin https://chromium.googlesource.com/chromium/tools/depot_tools.git
+git fetch --depth 1 origin "$DEPOT_REV"
+git checkout FETCH_HEAD
 export PATH=/depot-tools:$PATH
 export DEPOT_TOOLS_UPDATE=0
+popd
 
 mkdir /angle-build
 mkdir /angle
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 3e94e428c39..847f9a7c642 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,8 +23,8 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250422-ci-fairy"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250423-rootfs"
-  DEBIAN_TEST_GL_TAG: "20250423-rootfs"
+  DEBIAN_TEST_ANDROID_TAG: "20250502-depot-57"
+  DEBIAN_TEST_GL_TAG: "20250502-depot-57"
   DEBIAN_TEST_VIDEO_TAG: "20250423-rootfs"
   DEBIAN_TEST_VK_TAG: "20250423-rootfs"