diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
index 8d167816737..858cf927bab 100644
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -7,7 +7,7 @@
 
 set -uex
 
-uncollapsed_section_start apitrace "Building apitrace"
+section_start apitrace "Building apitrace"
 
 APITRACE_VERSION="45a005875d348b055d5b88dca285c109dee90457"
 
diff --git a/.gitlab-ci/container/build-bindgen.sh b/.gitlab-ci/container/build-bindgen.sh
index 709a9352b07..9884557aac8 100644
--- a/.gitlab-ci/container/build-bindgen.sh
+++ b/.gitlab-ci/container/build-bindgen.sh
@@ -6,7 +6,7 @@
 # DEBIAN_BUILD_TAG
 # FEDORA_X86_64_BUILD_TAG
 
-uncollapsed_section_start bindgen "Building bindgen"
+section_start bindgen "Building bindgen"
 
 BINDGEN_VER=0.71.1
 CBINDGEN_VER=0.26.0
diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh
index c85d4ec4a7d..47cd742747d 100644
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ b/.gitlab-ci/container/build-directx-headers.sh
@@ -7,7 +7,7 @@
 
 set -uex
 
-uncollapsed_section_start directx-headers "Building directx-headers"
+section_start directx-headers "Building directx-headers"
 
 git clone https://github.com/microsoft/DirectX-Headers -b v1.618.1 --depth 1
 pushd DirectX-Headers
diff --git a/.gitlab-ci/container/build-fossilize.sh b/.gitlab-ci/container/build-fossilize.sh
index 8ce3ee8d608..9b51ad631b1 100644
--- a/.gitlab-ci/container/build-fossilize.sh
+++ b/.gitlab-ci/container/build-fossilize.sh
@@ -6,7 +6,7 @@
 
 set -ex
 
-uncollapsed_section_start fossilize "Building fossilize"
+section_start fossilize "Building fossilize"
 
 git clone https://github.com/ValveSoftware/Fossilize.git
 cd Fossilize
diff --git a/.gitlab-ci/container/build-kdl.sh b/.gitlab-ci/container/build-kdl.sh
index e622b75f2e1..640790e2b23 100755
--- a/.gitlab-ci/container/build-kdl.sh
+++ b/.gitlab-ci/container/build-kdl.sh
@@ -3,7 +3,7 @@
 
 set -ex
 
-uncollapsed_section_start kdl "Building kdl"
+section_start kdl "Building kdl"
 
 KDL_REVISION="42218ba7297a28d64ddd1d4b5f200a60b3659d42"
 KDL_CHECKOUT_DIR="/tmp/ci-kdl.git"
diff --git a/.gitlab-ci/container/build-libclc.sh b/.gitlab-ci/container/build-libclc.sh
index 4d399305aca..f3c652aa468 100644
--- a/.gitlab-ci/container/build-libclc.sh
+++ b/.gitlab-ci/container/build-libclc.sh
@@ -2,7 +2,7 @@
 
 set -uex
 
-uncollapsed_section_start libclc "Building libclc"
+section_start libclc "Building libclc"
 
 export LLVM_CONFIG="llvm-config-${LLVM_VERSION:?"llvm unset!"}"
 LLVM_TAG="llvmorg-15.0.7"
diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh
index 396ba659cfe..479ea074da7 100644
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -5,7 +5,7 @@
 
 set -uex
 
-uncollapsed_section_start libdrm "Building libdrm"
+section_start libdrm "Building libdrm"
 
 export LIBDRM_VERSION=libdrm-2.4.122
 
diff --git a/.gitlab-ci/container/build-llvm-spirv.sh b/.gitlab-ci/container/build-llvm-spirv.sh
index 8fcfa4e9851..06565a8fdac 100644
--- a/.gitlab-ci/container/build-llvm-spirv.sh
+++ b/.gitlab-ci/container/build-llvm-spirv.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-uncollapsed_section_start llvm-spirv "Building LLVM-SPIRV-Translator"
+section_start llvm-spirv "Building LLVM-SPIRV-Translator"
 
 if [ "${LLVM_VERSION:?llvm version not set}" -ge 18 ]; then
   VER="${LLVM_VERSION}.1.0"
diff --git a/.gitlab-ci/container/build-shader-db.sh b/.gitlab-ci/container/build-shader-db.sh
index 0a6af9b63d2..7b50c952724 100644
--- a/.gitlab-ci/container/build-shader-db.sh
+++ b/.gitlab-ci/container/build-shader-db.sh
@@ -6,7 +6,7 @@
 
 set -ex
 
-uncollapsed_section_start shader-db "Building shader-db"
+section_start shader-db "Building shader-db"
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index 4a55cf706df..bff3b2f5e8f 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -10,7 +10,7 @@
 
 set -uex
 
-uncollapsed_section_start skqp "Building SkQP"
+section_start skqp "Building SkQP"
 
 SKQP_BRANCH=android-cts-12.1_r5
 
diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh
index 3638ac80083..24967c3bc90 100644
--- a/.gitlab-ci/container/build-vulkan-validation.sh
+++ b/.gitlab-ci/container/build-vulkan-validation.sh
@@ -6,7 +6,7 @@
 
 set -uex
 
-uncollapsed_section_start vulkan-validation "Building Vulkan validation layers"
+section_start vulkan-validation "Building Vulkan validation layers"
 
 VALIDATION_TAG="snapshot-2026wk06"
 
diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index e1fafab0b35..c852deec27d 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -3,7 +3,7 @@
 
 set -uex
 
-uncollapsed_section_start wayland "Building Wayland"
+section_start wayland "Building Wayland"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
diff --git a/.gitlab-ci/container/build-xwayland.sh b/.gitlab-ci/container/build-xwayland.sh
index b8f523caa50..d55f223db5e 100644
--- a/.gitlab-ci/container/build-xwayland.sh
+++ b/.gitlab-ci/container/build-xwayland.sh
@@ -3,7 +3,7 @@
 
 set -uex
 
-uncollapsed_section_start xwayland "Building XWayland"
+section_start xwayland "Building XWayland"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index cb686360ad3..28f14aba47b 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -11,7 +11,7 @@ set -e
 
 set -o xtrace
 
-uncollapsed_section_start debian_setup "Base Debian system setup"
+section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -242,7 +242,7 @@ fi
 
 ############### Uninstall the build software
 
-uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
+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 83d8a1977b0..7b4eb1e9f2f 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -7,7 +7,7 @@ set -e
 
 set -o xtrace
 
-uncollapsed_section_start debian_setup "Base Debian system setup"
+section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 : "${LLVM_VERSION:?llvm version not set!}"
@@ -123,7 +123,7 @@ fi
 
 ############### Uninstall the build software
 
-uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
+section_switch debian_cleanup "Cleaning up base Debian system"
 
 apt-get purge -y "${EPHEMERAL[@]}"
 
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
index cc744be9d09..4e3cbd620ad 100644
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -9,7 +9,7 @@ set -e
 
 set -o xtrace
 
-uncollapsed_section_start debian_setup "Base Debian system setup"
+section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -119,7 +119,7 @@ fi
 
 ############### Uninstall the build software
 
-uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
+section_switch debian_cleanup "Cleaning up base Debian system"
 
 apt-get purge -y "${EPHEMERAL[@]}"
 
diff --git a/.gitlab-ci/container/setup-wine.sh b/.gitlab-ci/container/setup-wine.sh
index a943fb07b8d..4eb3f3acb2b 100755
--- a/.gitlab-ci/container/setup-wine.sh
+++ b/.gitlab-ci/container/setup-wine.sh
@@ -2,7 +2,7 @@
 
 set -u
 
-uncollapsed_section_start wine "Setting up Wine"
+section_start wine "Setting up Wine"
 
 export WINEPREFIX="$1"
 export WINEDEBUG="-all"