diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 7b83a3fd44f..97a981f5f60 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -190,6 +190,8 @@ debian/s390x_build:
 
 # Android NDK cross-build image
 .android-variables:
+  extends:
+    - .container-builds-android
   variables:
     ANDROID_NDK_VERSION: "r27c"
     ANDROID_SDK_VERSION: 34
diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 50fd8d9b9b6..2ec601642d0 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -7,6 +7,12 @@
 section_start cuttlefish_setup "cuttlefish: setup"
 set -xe
 
+# Structured tagging check for angle
+if [ -n "$USE_ANGLE" ]; then
+    # Bail out if the ANGLE_TAG differs from what is offered in the system
+    ci_tag_test_time_check "ANGLE_TAG"
+fi
+
 export HOME=/cuttlefish
 export PATH=/cuttlefish/bin:$PATH
 export LD_LIBRARY_PATH=/cuttlefish/lib64:${CI_PROJECT_DIR}/install/lib:$LD_LIBRARY_PATH
@@ -168,6 +174,8 @@ $ADB shell stop
 $ADB shell start
 
 # Check what GLES implementation Surfaceflinger is using after copying the new mesa libraries
+# Note: we are injecting the ANGLE libs in the vendor partition, so we need to check if the
+#       ANGLE libs are being used after the shell restart
 while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
 MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)"
 
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 5f4dc53fd1e..a6a9b03c060 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -26,6 +26,8 @@ export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH
 export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
 
 if [ -n "$USE_ANGLE" ]; then
+  # Are we using the right angle version?
+  ci_tag_test_time_check "ANGLE_TAG"
   export LD_LIBRARY_PATH=/angle:$LD_LIBRARY_PATH
 fi
 
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 8fe6012bbba..0728d55b35f 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -178,6 +178,10 @@ yaml-toml-shell-py-test:
     paths:
       - results/
 
+.test-angle:
+  variables:
+    ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG}
+
 .b2c-vkd3d-proton-test:
   variables:
     HWCI_TEST_SCRIPT: install/vkd3d-runner.sh
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 39515e6165d..f724b26dcc2 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -15,6 +15,7 @@ radv-stoney-angle:
   extends:
     - .lava-test-deqp:x86_64
     - .radv-stoney-test:x86_64
+    - .test-angle
   variables:
     DEQP_SUITE: radv-stoney-angle
     USE_ANGLE: 1
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index d12b5b57df7..e030c5c2dfa 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -370,6 +370,7 @@
 .anv-angle-test:
   extends:
     - .anv-test
+    - .test-angle
   variables:
     VK_DRIVER: intel
     USE_ANGLE: 1