diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5ffddc1d0d..80941712c0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -460,7 +460,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-03-16-piglit-runner"
+    MESA_IMAGE_TAG: &arm64_test "2021-03-17-waffle-dep"
 
 .use-arm64_test:
   extends:
@@ -477,7 +477,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-03-16-piglit-runner"
+    MESA_IMAGE_TAG: &armhf_test "2021-03-17-waffle-dep"
 
 .use-armhf_test:
   extends:
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index 0305a5057c2..fe98e558f31 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -23,6 +23,7 @@ BAREMETAL_EPHEMERAL=" \
         libexpat1-dev:$arch \
         libffi-dev:$arch \
         libgbm-dev:$arch \
+        libgl1-mesa-dev:$arch \
         libgles2-mesa-dev:$arch \
         libpciaccess-dev:$arch \
         libpcre3-dev:$arch \