diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index 159197e4132..1166822dbb6 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: 525d8d88f212c0f537cd984bbf9e97c5
+  CONDITIONAL_BUILD_ANGLE_TAG: ccde6a2b0d3509c2a8fc459cbd936ac4
   CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a
   CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
   CONDITIONAL_BUILD_PIGLIT_TAG: 31939f3b6f2a619277594e671c9fbbff
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 0cf09d2791d..64467644a2e 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="538129c6b3c17dc864101c7a4af4b74b00706f82"
+ANGLE_REV="8ed16003f27125f27cbb87578368e447043420d3"
 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 2143f0b548d..52eeb166d90 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,8 +23,8 @@ variables:
   DEBIAN_BUILD_TAG: "20250926-D3D618"
 
   DEBIAN_TEST_BASE_TAG: "20250926-gitlab"
-  DEBIAN_TEST_ANDROID_TAG: "20251104-vkcts"
-  DEBIAN_TEST_GL_TAG: "20251003-angle-53"
+  DEBIAN_TEST_ANDROID_TAG: "20251013-angle-8e"
+  DEBIAN_TEST_GL_TAG: "20251013-angle-8e"
   DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
   DEBIAN_TEST_VK_TAG: "20251104-vkcts"