diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 81723c33a3e..414a37f8a60 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -65,22 +65,29 @@ EPHEMERAL=(
     python3-pip
     python3-setuptools
     python3-wheel
-    spirv-tools
     wayland-protocols
     xz-utils
 )
 
 DEPS=(
     apt-utils
+    clinfo
     curl
     git
     git-lfs
     inetutils-syslogd
     iptables
     jq
+    kmod
     libasan8
+    libcap2
     libdrm2
+    libegl1
+    libepoxy0
     libexpat1
+    libfdt1
+    "libclang-common-${LLVM_VERSION}-dev"
+    "libclang-cpp${LLVM_VERSION}"
     "libllvm${LLVM_VERSION}"
     liblz4-1
     libpng16-16
@@ -91,20 +98,33 @@ DEPS=(
     libwayland-server0
     libxcb-ewmh2
     libxcb-randr0
+    libxcb-shm0
     libxcb-xfixes0
     libxkbcommon0
     libxrandr2
     libxrender1
+    ocl-icd-libopencl1
+    pciutils
+    python3-lxml
     python3-mako
     python3-numpy
     python3-packaging
     python3-pil
+    python3-renderdoc
     python3-requests
+    python3-simplejson
     python3-six
     python3-yaml
     socat
+    spirv-tools
+    sysvinit-core
     vulkan-tools
     waffle-utils
+    weston
+    xwayland
+    xinit
+    xserver-xorg-video-amdgpu
+    xserver-xorg-video-ati
     xauth
     xvfb
     zlib1g
diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index b672ae86f86..a73a180a1d5 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -54,24 +54,6 @@ EPHEMERAL=(
 )
 
 DEPS=(
-    clinfo
-    iptables
-    kmod
-    "libclang-common-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}"
-    libcap2
-    libegl1
-    libepoxy0
-    libfdt1
-    libxcb-shm0
-    ocl-icd-libopencl1
-    python3-lxml
-    python3-renderdoc
-    python3-simplejson
-    spirv-tools
-    sysvinit-core
-    weston
-    xwayland
 )
 
 apt-get update
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
index dda1e2a93c5..f36e6ab6972 100644
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -13,8 +13,6 @@ uncollapsed_section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get install -y libelogind0  # this interfere with systemd deps, install separately
-
 # Ephemeral packages (installed for this script and removed again at the end)
 EPHEMERAL=(
     ccache
@@ -55,26 +53,14 @@ EPHEMERAL=(
 )
 
 DEPS=(
-    curl
-    libepoxy0
-    libxcb-shm0
-    pciutils
-    python3-lxml
-    python3-simplejson
-    sysvinit-core
-    weston
-    xwayland
     wine
     wine64
-    xinit
-    xserver-xorg-video-amdgpu
-    xserver-xorg-video-ati
 )
 
 apt-get update
 
 apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
+      "${DEPS[@]}" "${EPHEMERAL[@]}" "${EXTRA_LOCAL_PACKAGES:-}"
 
 ############### Building ...