diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 09816ad0720..1d7a642692d 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -6,8 +6,13 @@
 # DEBIAN_BASE_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
+uncollapsed_section_start debian_setup "Base Debian system setup"
+
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get install -y ca-certificates gnupg2 software-properties-common
@@ -114,15 +119,6 @@ apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_pre_build.sh
 
-############### Download prebuilt kernel
-
-if [ "$DEBIAN_ARCH" = amd64 ]; then
-  export KERNEL_IMAGE_NAME=bzImage
-
-  mkdir -p /lava-files/
-  . .gitlab-ci/container/download-prebuilt-kernel.sh
-fi
-
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 # and doesn't depend on git
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
@@ -130,28 +126,59 @@ pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedeskt
 # Needed for manipulation with traces yaml files.
 pip3 install --break-system-packages yq
 
+############### Download prebuilt kernel
+
+if [ "$DEBIAN_ARCH" = amd64 ]; then
+  uncollapsed_section_switch kernel "Downloading kernel"
+  export KERNEL_IMAGE_NAME=bzImage
+  mkdir -p /lava-files/
+  . .gitlab-ci/container/download-prebuilt-kernel.sh
+fi
+
+############### Build mold
+
+uncollapsed_section_switch mold "Building mold linker"
+
 . .gitlab-ci/container/build-mold.sh
 
 ############### Build LLVM-SPIRV translator
 
+uncollapsed_section_switch llvmspv "Building LLVM-SPIRV-Translator"
+
 . .gitlab-ci/container/build-llvm-spirv.sh
 
 ############### Build libclc
 
+uncollapsed_section_switch libclc "Building libclc"
+
 . .gitlab-ci/container/build-libclc.sh
 
 ############### Build Wayland
 
+uncollapsed_section_switch wayland "Building Wayland"
+
 . .gitlab-ci/container/build-wayland.sh
 
+############### Install Rust toolchain
+
+uncollapsed_section_switch rust "Installing Rust toolchain"
+
+. .gitlab-ci/container/build-rust.sh
+
 ############### Build Crosvm
 
-. .gitlab-ci/container/build-rust.sh
+uncollapsed_section_switch crosvm "Building crosvm"
 . .gitlab-ci/container/build-crosvm.sh
 
 ############### Build dEQP runner
+
+uncollapsed_section_switch deqpr "Building deqp-runner"
+
 . .gitlab-ci/container/build-deqp-runner.sh
 
+############### Uninstall the build software
+
+uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
 
 apt-get purge -y "${EPHEMERAL[@]}"
 
diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index 996859e72da..5272c4c07be 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -2,8 +2,13 @@
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
+uncollapsed_section_start debian_setup "Base Debian system setup"
+
 export DEBIAN_FRONTEND=noninteractive
 export LLVM_VERSION="${LLVM_VERSION:=15}"
 
@@ -79,6 +84,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
 
 ############### Build piglit
 
+uncollapsed_section_switch piglit "Building Piglit"
+
 PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
 	     -DPIGLIT_USE_GBM=ON
 	     -DPIGLIT_USE_WAYLAND=ON
@@ -97,10 +104,14 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
 
 ############### Build dEQP GL
 
+uncollapsed_section_switch piglit_gl "Building dEQP for GL"
+
 DEQP_API=GL \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh
 
+uncollapsed_section_switch piglit_gles "Building dEQP for GLES"
+
 DEQP_API=GLES \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh
@@ -111,14 +122,20 @@ DEQP_TARGET=surfaceless \
 
 ############### Build validation layer for zink
 
+uncollapsed_section_switch vvl "Building Vulkan validation layers"
+
 . .gitlab-ci/container/build-vulkan-validation.sh
 
 ############### Build nine tests
 
+uncollapsed_section_switch nine "Building Nine tests"
+
 . .gitlab-ci/container/build-ninetests.sh
 
 ############### Uninstall the build software
 
+uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
+
 apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
index 636f28710d4..2f51077efe2 100644
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -4,8 +4,13 @@
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
+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
@@ -76,6 +81,9 @@ apt-get install -y --no-remove --no-install-recommends \
 . .gitlab-ci/container/container_pre_build.sh
 
 ############### Build piglit replayer
+
+uncollapsed_section_switch piglit "Building Piglit for Vulkan (traces only)"
+
 # We don't run any _piglit_ Vulkan tests in the containers.
 PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
 	     -DPIGLIT_USE_GBM=OFF
@@ -94,32 +102,44 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
   PIGLIT_BUILD_TARGETS="piglit_replayer" \
   . .gitlab-ci/container/build-piglit.sh
 
-############### Build Fossilize
-
-. .gitlab-ci/container/build-fossilize.sh
-
 ############### Build dEQP VK
 
+uncollapsed_section_switch deqp "Building Vulkan CTS (dEQP)"
+
 DEQP_API=VK \
 DEQP_TARGET=default \
 . .gitlab-ci/container/build-deqp.sh
 
 ############### Build apitrace
 
+uncollapsed_section_switch apitrace "Building apitrace"
+
 . .gitlab-ci/container/build-apitrace.sh
 
+############### Build Fossilize
+
+uncollapsed_section_switch fossilize "Building Fossilize"
+
+. .gitlab-ci/container/build-fossilize.sh
+
 ############### Build gfxreconstruct
 
+uncollapsed_section_switch gfxreconstruct "Building gfxreconstruct"
+
 . .gitlab-ci/container/build-gfxreconstruct.sh
 
 ############### Build VKD3D-Proton
 
+uncollapsed_section_switch proton "Installing Proton (Wine/D3DVK emulation)"
+
 . .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64"
 
 . .gitlab-ci/container/build-vkd3d-proton.sh
 
 ############### Uninstall the build software
 
+uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
+
 apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh