diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 205e1a105f0..768bfb222b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -313,7 +313,7 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_build "2021-04-13-llvm-spirv"
+    MESA_IMAGE_TAG: &x86_build "2021-04-13-glvnd"
 
 .use-x86_build:
   extends:
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index 4d4b7622b67..6fdc053aad8 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -27,6 +27,7 @@ apt-get install -y --no-remove \
       libasan6 \
       libarchive-dev \
       libclang-cpp11-dev \
+      libglvnd-dev \
       libllvmspirvlib-dev \
       liblua5.3-dev \
       libxcb-dri2-0-dev \
@@ -84,16 +85,6 @@ cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --
 rm -rf $LIBWAYLAND_VERSION
 
 
-# The version of libglvnd-dev in debian is too old
-# Check this page to see when this local compilation can be dropped in favour of the package:
-# https://packages.debian.org/libglvnd-dev
-GLVND_VERSION=1.3.2
-wget https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$GLVND_VERSION/libglvnd-v$GLVND_VERSION.tar.gz
-tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz
-pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
-rm -rf libglvnd-v$GLVND_VERSION
-
-
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
 rm -rf shader-db/.git