diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0841437d..dd8d0fa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@
 variables:
   FDO_UPSTREAM_REPO: wayland/weston
   FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
-  FDO_DISTRIBUTION_TAG: '2022-02-07.00-add-vgem-to-ci'
+  FDO_DISTRIBUTION_TAG: '2022-06-06.00-build-libdrm-dep'
 
 
 include:
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh
index 158ff7c4..1f85fb8f 100755
--- a/.gitlab-ci/build-deps.sh
+++ b/.gitlab-ci/build-deps.sh
@@ -130,6 +130,17 @@ ninja ${NINJAFLAGS} -C build install
 cd ..
 rm -rf mesa
 
+# Build and install our own version of libdrm. Debian 11 (bullseye) provides
+# libdrm 2.4.104 which doesn't have the IN_FORMATS iterator api. We can stop
+# building and installing libdrm as soon as we move to Debian 12.
+git clone --branch libdrm-2.4.108 --depth=1 https://gitlab.freedesktop.org/mesa/drm.git
+cd drm
+meson build -Dauto_features=disabled \
+	-Dvc4=false -Dfreedreno=false -Detnaviv=false
+ninja ${NINJAFLAGS} -C build install
+cd ..
+rm -rf drm
+
 # PipeWire is used for remoting support. Unlike our other dependencies its
 # behaviour will be stable, however as a pre-1.0 project its API is not yet
 # stable, so again we lock it to a fixed version.
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 2c243101..9b9d2a6d 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -68,6 +68,7 @@ apt-get -y --no-install-recommends install \
 	libmtdev-dev \
 	libpam0g-dev \
 	libpango1.0-dev \
+	libpciaccess-dev \
 	libpixman-1-dev \
 	libpng-dev \
 	libpulse-dev \