diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 856095493d3..dd8ee81c8d8 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -161,6 +161,7 @@ CONTAINER_EPHEMERAL=(
     libxcb-dri2-0-dev
     libxkbcommon-dev
     libwayland-dev
+    lld
     ninja-build
     openssh-server
     patch
@@ -304,7 +305,7 @@ mv /apitrace/build $ROOTFS/apitrace
 rm -rf /apitrace
 
 ############### Build ANGLE
-if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
+if [ "$DEBIAN_ARCH" != "armhf" ]; then
   ANGLE_TARGET=linux \
   . .gitlab-ci/container/build-angle.sh
   mv /angle $ROOTFS/.
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 2a6e25c5b2c..0c4bb68dd0e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -33,7 +33,7 @@ variables:
    DEBIAN_TEST_ANDROID_TAG: "20250212-re-angle"
    DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
    DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
-   KERNEL_ROOTFS_TAG: "20250212-re-angle"
+   KERNEL_ROOTFS_TAG: "20250212-arm-angle"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250129-lavacli"