diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68dd92f4fcb..46d2567695c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -427,7 +427,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    MESA_IMAGE_TAG: &arm_build "2021-04-01-u-boot-tools"
+    MESA_IMAGE_TAG: &arm_build "2021-04-07-lavacli-1-1"
 
 .use-arm_build:
   extends:
diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index 4f6ed560514..89a06c52806 100644
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -7,6 +7,12 @@ apt-get -y install ca-certificates
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 apt-get update
+
+EPHEMERAL="
+	python3-pytest-runner
+	python3-wheel
+	"
+
 apt-get -y install \
 	abootimg \
 	android-sdk-ext4-utils \
@@ -22,7 +28,6 @@ apt-get -y install \
 	g++ \
 	git \
 	kmod \
-	lavacli \
 	libasan5 \
 	libdrm-dev \
 	libelf-dev \
@@ -44,22 +49,32 @@ apt-get -y install \
 	llvm-8-dev \
 	pkg-config \
 	python \
+	python3-aiohttp \
+	python3-jinja2 \
 	python3-mako \
 	python3-pil \
 	python3-pip \
 	python3-requests \
 	python3-setuptools \
+	python3-yaml \
+	python3-zmq \
 	u-boot-tools \
 	unzip \
 	wget \
 	xz-utils \
-	zlib1g-dev
+	zlib1g-dev \
+	$EPHEMERAL
+
+# Update lavacli to v1.1+
+pip3 install git+https://git.lavasoftware.org/lava/lavacli@3db3ddc45e5358908bc6a17448059ea2340492b7
 
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
 
 apt install -y --no-remove -t buster-backports \
     meson
 
+apt-get purge -y $EPHEMERAL
+
 arch=armhf
 . .gitlab-ci/container/cross_build.sh