diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index f592fff1f2a..d237d8485e6 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: ab19bccfd3858c539ba8cb8d9b52a003
+  CONDITIONAL_BUILD_ANGLE_TAG: e7c547147880538db994f480292364c7
   CONDITIONAL_BUILD_PIGLIT_TAG: e2cb48af623fb6c8b9793679de33d5be
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 9ebf3646ae8..62794924009 100755
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -13,7 +13,7 @@ uncollapsed_section_start angle "Building ANGLE"
 # setting up the environment variables locally
 ci_tag_build_time_check "ANGLE_TAG"
 
-ANGLE_REV="a3f2545f6bb3e8d27827dceb2b4e901673995ad1"
+ANGLE_REV="f355e2b37ed43939e2753fc7dacccf75abb4c1a3"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
 if [[ -z "${ANGLE_ARCH:-}" ]]; then
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index b63b572e955..25bc4bc2dde 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,10 +23,10 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250422-ci-fairy"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250417-aosp-cts"
-  DEBIAN_TEST_GL_TAG: "20250418-apitrace"
+  DEBIAN_TEST_ANDROID_TAG: "20250422-angle-f3"
+  DEBIAN_TEST_GL_TAG: "20250422-angle-f3"
   DEBIAN_TEST_VK_TAG: "20250419-vkd3d"
-  KERNEL_ROOTFS_TAG: "20250418-apitrace"
+  KERNEL_ROOTFS_TAG: "20250422-angle-f3"
 
   DEBIAN_PYUTILS_TAG: "20250422-ci-fairy"
 
diff --git a/src/freedreno/ci/freedreno-a660-flakes.txt b/src/freedreno/ci/freedreno-a660-flakes.txt
index 41286b28e2c..785a1f474a7 100644
--- a/src/freedreno/ci/freedreno-a660-flakes.txt
+++ b/src/freedreno/ci/freedreno-a660-flakes.txt
@@ -94,3 +94,5 @@ angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_ar
 angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_implicit.isolines
 angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_shader_builtin.isolines
 angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_vertex.vertex_io_array_size_shader_builtin.triangles_explicit_tcs_out_size
+angle-dEQP-GLES31.functional.tessellation.invariance.outer_edge_symmetry.isolines_fractional_odd_spacing_cw_point_mode
+