diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 427e44470b5..acbad9eb904 100755
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -133,7 +133,7 @@ fi
   export HOST_AR="$AR"
   export NM="nm"
   export HOST_NM="$NM"
-  export LDFLAGS="-lpthread -ldl"
+  export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
   export HOST_LDFLAGS="$LDFLAGS"
 
   gn gen out/Release
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index dd8ee81c8d8..f1ce93675fc 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -161,7 +161,7 @@ CONTAINER_EPHEMERAL=(
     libxcb-dri2-0-dev
     libxkbcommon-dev
     libwayland-dev
-    lld
+    "lld-${LLVM_VERSION}"
     ninja-build
     openssh-server
     patch
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 0c4bb68dd0e..291d3f89b49 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-arm-angle"
+   KERNEL_ROOTFS_TAG: "20250212-fix-angle"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250129-lavacli"