diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed410e14b..5e779853a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
     FDO_UPSTREAM_REPO: xorg/xserver
     FDO_DISTRIBUTION_VERSION: bullseye-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
-    FDO_DISTRIBUTION_TAG: "2024-08-23-xcb-0"
+    FDO_DISTRIBUTION_TAG: "2024-08-23-xcb-1"
     MESON_BUILDDIR: "build"
 
 include:
diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh
index a8b6e5424..ed12956d0 100755
--- a/.gitlab-ci/cross-prereqs-build.sh
+++ b/.gitlab-ci/cross-prereqs-build.sh
@@ -51,7 +51,7 @@ build 'https://gitlab.freedesktop.org/xorg/lib/pthread-stubs.git' '0.4'
 # these would add -I/usr/include to CFLAGS, which breaks cross-compilation
 build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'master' '--datadir=/lib'
 build 'https://gitlab.freedesktop.org/xorg/lib/libXau.git' 'libXau-1.0.9'
-build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'master'
+build 'https://gitlab.freedesktop.org/metux/xcbproto.git' 'master'
 build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'master'
 build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0'
 # the default value of keysymdefdir is taken from the includedir variable for
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 67e9b267f..85eb73816 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -116,7 +116,7 @@ apt-get install -y \
 	xutils-dev
 
 # Xnest requires xcb bugfix
-git clone https://gitlab.freedesktop.org/xorg/proto/xcbproto.git --depth 1 --branch=master
+git clone https://gitlab.freedesktop.org/metux/xcbproto.git --depth 1 --branch=master
 ( cd xcbproto && ./autogen.sh --prefix=/usr && make && make install )
 rm -Rf xcbproto