diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fa00ba91..a7a1603b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,7 +113,13 @@ meson-dist:
             - $MESON_BUILDDIR/meson-logs/
             - $MESON_BUILDDIR/xserver-*/$MESON_BUILDDIR/meson-logs/
     script:
-        - .gitlab-ci/dist.sh
+        - .gitlab-ci/meson-build.sh --run-dist
+        - mkdir xserver-tarball
+        - tar xf $MESON_BUILDDIR/meson-dist/xserver-*.tar.xz -C xserver-tarball --strip-components=1
+        - .gitlab-ci/meson-build.sh -C xserver-tarball --skip-test --skip-dist --run-install
+    variables:
+      MESON_DIST_ARGS: --no-tests
+      DESTDIR: xserver-tarball/install/
 
 #
 # Verify that commit messages are as expected
diff --git a/.gitlab-ci/dist.sh b/.gitlab-ci/dist.sh
deleted file mode 100755
index 29feebbfd..000000000
--- a/.gitlab-ci/dist.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-meson build/
-meson dist --no-tests -C build/
-
-cd build
-tar xf meson-dist/xserver-*.tar.xz
-cd xserver-*/
-
-meson -Dc_args="-fno-common" -Dprefix=/usr -Dwerror=true build/
-DESTDIR=$PWD/install/ ninja -j${FDO_CI_CONCURRENT:-4} -C build/ install