diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index 596abdf878c..712bf2408ea 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,5 +1,5 @@
 variables:
-  CONDITIONAL_BUILD_ANGLE_TAG: 30422b1b4732b9f6de6d3e7fe329b569
+  CONDITIONAL_BUILD_ANGLE_TAG: f62910e55be46e37cc867d037e4a8121
   CONDITIONAL_BUILD_CROSVM_TAG: bb7f75d912ef43be8c9204385d79820a
   CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9
   CONDITIONAL_BUILD_PIGLIT_TAG: 009be6e9949c1121f67c8a3985b08505
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index d992810d0a8..39cbf33211d 100755
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -13,7 +13,7 @@ section_start angle "Building ANGLE"
 # setting up the environment variables locally
 ci_tag_build_time_check "ANGLE_TAG"
 
-ANGLE_REV="b1359277066648c3577ea8b57cc5e0bccee7b6cc"
+ANGLE_REV="c39f4a5c553cbee39af8f866aa82a9ffa4f02f5b"
 DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index f33bcd6ca9b..e7c7f204d10 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,8 +23,8 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250515-aarch64"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250605-glcts"
-  DEBIAN_TEST_GL_TAG: "20250605-glcts"
+  DEBIAN_TEST_ANDROID_TAG: "20250611-angle-c3"
+  DEBIAN_TEST_GL_TAG: "20250611-angle-c3"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
   DEBIAN_TEST_VK_TAG: "20250609-vkd3d"