diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e6b22652..f115fa470 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -232,7 +232,7 @@ meson-dist:
       MESON_DIST_ARGS: --no-tests
       DESTDIR: xserver-tarball/install/
 
-xf86-driver-build-test:
+.xf86-driver-build-test:
     extends:
         - .xorg-image@debian
         - .ci-run-policy
diff --git a/meson_options.txt b/meson_options.txt
index 94698f218..d41f3d01f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,20 +1,20 @@
-option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'false',
        description: 'Enable Xorg X Server')
 option('xephyr', type: 'boolean', value: false,
        description: 'Enable Xephyr nested X server')
-option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'false',
        description: 'Enable Xwayland X server')
 option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
        description: 'Enable glamor (default yes for Xorg/Xwayland builds)')
 option('xwayland_ei', type: 'combo', choices: ['socket', 'portal', 'false', 'auto'],
        value: 'auto', description: 'Enable emulated input support on Xwayland')
-option('xnest', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+option('xnest', type: 'combo', choices: ['true', 'false', 'auto'], value: 'true',
        description: 'Enable Xnest nested X server')
-option('xvfb', type: 'boolean', value: true,
+option('xvfb', type: 'boolean', value: false,
        description: 'Enable Xvfb X server')
-option('xwin', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+option('xwin', type: 'combo', choices: ['true', 'false', 'auto'], value: 'false',
        description: 'Enable XWin X server')
-option('xquartz', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+option('xquartz', type: 'combo', choices: ['true', 'false', 'auto'], value: 'false',
        description: 'Enable Xquartz X server')