diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index 544da507637..e22cdc35346 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,6 +1,6 @@
 variables:
   CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7
-  CONDITIONAL_BUILD_ANGLE_TAG: cb6fbd691dd8721c62f0adbef0c97cf7
+  CONDITIONAL_BUILD_ANGLE_TAG: 9aaedd74072834a3c553656b6ddc17a7
   CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377
   CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9
   CONDITIONAL_BUILD_PIGLIT_TAG: 827b708ab7309721395ea28cec512968
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index f2b9fb12871..ef1b56c663b 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="c39f4a5c553cbee39af8f866aa82a9ffa4f02f5b"
+ANGLE_REV="6a04a50f98cac71b25464d10289ce7a013841caf"
 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 8ef0103d3ba..a63104eb162 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,8 +23,8 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250710-libwayland"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250714-vkcts"
-  DEBIAN_TEST_GL_TAG: "20250717-vvl"
+  DEBIAN_TEST_ANDROID_TAG: "20250718-angle-6a"
+  DEBIAN_TEST_GL_TAG: "20250718-angle-6a"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
   DEBIAN_TEST_VK_TAG: "20250714-vkcts"