diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 6f81bc4fd17..426ff879563 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -192,14 +192,15 @@ if [ -n "$HWCI_START_WESTON" ]; then
     echo "Please consider dropping HWCI_START_XORG and instead using Weston XWayland for testing."
     WESTON_X11_SOCK="/tmp/.X11-unix/X1"
   fi
-  export WAYLAND_DISPLAY=wayland-0
+  WAYLAND_DISPLAY=wayland-0
 
   # Display server is Weston Xwayland when HWCI_START_XORG is not set or Xorg when it's
   export DISPLAY=:0
   mkdir -p /tmp/.X11-unix
 
-  env weston --config="/install/common/weston.ini" -Swayland-0 --use-gl &
+  weston --config="/install/common/weston.ini" --socket="$WAYLAND_DISPLAY" --renderer=gl &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
+  export WAYLAND_DISPLAY
 
   while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
 fi
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index 37aff79e988..cc996083d78 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -93,11 +93,12 @@ else
     # copy-paste from init-stage2.sh, please update accordingly
     {
       WESTON_X11_SOCK="/tmp/.X11-unix/X0"
-      export WAYLAND_DISPLAY=wayland-0
+      WAYLAND_DISPLAY=wayland-0
       export DISPLAY=:0
       mkdir -p /tmp/.X11-unix
 
-      env weston --config="/install/common/weston.ini" -Swayland-0 --use-gl &
+      weston --config="/install/common/weston.ini" --socket="$WAYLAND_DISPLAY" --renderer=gl &
+      export WAYLAND_DISPLAY
 
       while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
     }
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 72588802262..84160bb5f6f 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -42,8 +42,9 @@ llvmpipe:
     export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib"
     export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri"
     section_start weston "weston: prepare"
-    weston -Bheadless-backend.so -Swayland-0 --idle-time=0 &
-    export WAYLAND_DISPLAY=wayland-0
+    WAYLAND_DISPLAY=wayland-0
+    weston --backend=headless-backend.so --socket="$WAYLAND_DISPLAY" --idle-time=0 &
+    export WAYLAND_DISPLAY
     section_end weston
     xvfb-run -e results/xvfb.log --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"