diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d58c73e0d91..94357cb2128 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -415,7 +415,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-gl "2021-05-25-piglit"
+    MESA_IMAGE_TAG: &x86_test-gl "2021-05-25-apitrace"
 
 # Debian 11 based x86 test image for VK
 x86_test-vk:
@@ -450,7 +450,7 @@ arm_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-2a4a4fa4407f/v5.13-rc2-for-mesa-ci-2a4a4fa4407f.tar.bz2"
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-25-piglit"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-25-apitrace"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
new file mode 100644
index 00000000000..e50ff5ad968
--- /dev/null
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -ex
+
+APITRACE_VERSION="170424754bb46002ba706e16ee5404b61988d74a"
+
+git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
+pushd /apitrace
+git checkout "$APITRACE_VERSION"
+git submodule update --init --depth 1 --recursive
+cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on $EXTRA_CMAKE_ARGS
+ninja -C _build
+mkdir build
+cp _build/apitrace build
+cp _build/eglretrace build
+${STRIP_CMD:-strip} build/*
+find . -not -path './build' -not -path './build/*' -delete
+popd
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 783bb5fdf90..23e22322a58 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -21,7 +21,6 @@ INSTALL_CI_FAIRY_PACKAGES="git
 apt-get -y install --no-install-recommends \
     $ARCH_PACKAGES \
     $INSTALL_CI_FAIRY_PACKAGES \
-    apitrace \
     ca-certificates \
     curl \
     firmware-realtek \
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 92da5831cbf..c42f60c3984 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -78,6 +78,7 @@ apt-get install -y --no-remove \
                    libegl1-mesa-dev \
                    libgbm-dev \
                    libgles2-mesa-dev \
+                   libpng-dev \
                    libssl-dev \
                    libudev-dev \
                    libvulkan-dev \
@@ -99,6 +100,7 @@ if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
                        libelf-dev:armhf \
                        libgbm-dev:armhf \
                        libgles2-mesa-dev:armhf \
+                       libpng-dev:armhf \
                        libudev-dev:armhf \
                        libvulkan-dev:armhf \
                        libwaffle-dev:armhf \
@@ -113,6 +115,13 @@ STRIP_CMD="${GCC_ARCH}-strip"
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}
 
 
+############### Build apitrace
+. .gitlab-ci/container/build-apitrace.sh
+mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
+mv /apitrace/build /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
+rm -rf /apitrace
+
+
 ############### Build dEQP runner
 . .gitlab-ci/container/build-deqp-runner.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 4b96c13f58c..9ff838f5ce0 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -18,6 +18,7 @@ STABLE_EPHEMERAL=" \
       libgles2-mesa-dev \
       libllvmspirvlib-dev \
       libpciaccess-dev \
+      libpng-dev \
       libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
@@ -39,7 +40,6 @@ STABLE_EPHEMERAL=" \
 
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
-      apitrace \
       clinfo \
       libclang-common-11-dev \
       libclang-cpp11 \
@@ -76,6 +76,9 @@ PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_VK_TESTS=OFF" . .gitlab-c
 
 DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
+############### Build apitrace
+
+. .gitlab-ci/container/build-apitrace.sh
 
 ############### Uninstall the build software