diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index 044c0423304..15429f662d0 100755
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -34,7 +34,7 @@ if [ -n "$BM_START_XORG" ]; then
   env \
     LD_LIBRARY_PATH=/install/lib/ \
     LIBGL_DRIVERS_PATH=/install/lib/dri/ \
-    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -dpms -logfile /Xorg.0.log &
+    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
 
   # Wait for xorg to be ready for connections.
   for i in 1 2 3 4 5; do
diff --git a/.gitlab-ci/common/start-x.sh b/.gitlab-ci/common/start-x.sh
index f481be4c631..4d3336fbb92 100755
--- a/.gitlab-ci/common/start-x.sh
+++ b/.gitlab-ci/common/start-x.sh
@@ -10,7 +10,7 @@ if [ "x$1" != "x" ]; then
     export LD_LIBRARY_PATH="${1}/lib"
     export LIBGL_DRIVERS_PATH="${1}/lib/dri"
 fi
-xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -dpms -logfile /Xorg.0.log &
+xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -s 0 -dpms -logfile /Xorg.0.log &
 
 # Wait for xorg to be ready for connections.
 for i in 1 2 3 4 5; do
diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2
index d4f04d42ee4..51b4819f4a0 100644
--- a/.gitlab-ci/lava/lava.yml.jinja2
+++ b/.gitlab-ci/lava/lava.yml.jinja2
@@ -116,7 +116,7 @@ actions:
           # your client's return code
           - "if [ -n $LAVA_START_XORG ]; then
                echo 'touch /xorg-started; sleep 100000' > /xorg-script;
-               env LD_LIBRARY_PATH=/install/lib/ xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -dpms -logfile /Xorg.0.log &
+               env LD_LIBRARY_PATH=/install/lib/ xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
                for i in 1 2 3 4 5; do
                  if [ -e /xorg-started ]; then
                    break;