diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
new file mode 100644
index 00000000000..41f024e9083
--- /dev/null
+++ b/.gitlab-ci/container/build-angle.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+set -ex
+
+ANGLE_REV="82f1cee01a9ea24960e8f23b24d348fccbe0aae0"
+
+# DEPOT tools
+git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+PWD=$(pwd)
+export PATH=$PWD/depot_tools:$PATH
+export DEPOT_TOOLS_UPDATE=0
+
+mkdir /angle-build
+pushd /angle-build
+git init
+git remote add origin https://chromium.googlesource.com/angle/angle.git
+git fetch --depth 1 origin "$ANGLE_REV"
+git checkout FETCH_HEAD
+
+# source preparation
+python3 scripts/bootstrap.py
+mkdir -p build/config
+gclient sync
+
+sed -i "/catapult/d" testing/BUILD.gn
+
+mkdir -p out/Release
+echo '
+is_debug = false
+angle_enable_swiftshader = false
+angle_enable_null = false
+angle_enable_gl = false
+angle_enable_vulkan = true
+angle_has_histograms = false
+build_angle_trace_perf_tests = false
+build_angle_deqp_tests = false
+angle_use_custom_libvulkan = false
+dcheck_always_on=true
+' > out/Release/args.gn
+
+if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
+  build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
+fi
+
+gn gen out/Release
+# depot_tools overrides ninja with a version that doesn't work.  We want
+# ninja with FDO_CI_CONCURRENT anyway.
+/usr/local/bin/ninja -C out/Release/
+
+mkdir /angle
+cp out/Release/lib*GL*.so /angle/
+ln -s libEGL.so /angle/libEGL.so.1
+ln -s libGLESv2.so /angle/libGLESv2.so.2
+
+rm -rf out
+
+popd
+rm -rf ./depot_tools
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index fc51d23a35f..278d627ce9b 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -245,6 +245,12 @@ mkdir -p $ROOTFS/apitrace
 mv /apitrace/build $ROOTFS/apitrace
 rm -rf /apitrace
 
+############### Build ANGLE
+if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
+  . .gitlab-ci/container/build-angle.sh
+  mv /angle /lava-files/rootfs-${DEBIAN_ARCH}/.
+  rm -rf /angle
+fi
 
 ############### Build dEQP runner
 . .gitlab-ci/container/build-deqp-runner.sh
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 4e095f67214..b1f440e4314 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -20,7 +20,7 @@ variables:
 
    ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
    FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on"
-   KERNEL_ROOTFS_TAG: "2023-07-02-apitrace-lto"
+   KERNEL_ROOTFS_TAG: "2023-07-05-angle"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"