diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh
index 6e25c1ab936..f8e5b2c24b0 100644
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -6,6 +6,9 @@
 # ALPINE_X86_64_BUILD_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 EPHEMERAL=(
diff --git a/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh b/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
index 585e30323c4..379fcf65507 100644
--- a/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
+++ b/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
@@ -4,6 +4,9 @@
 
 # shellcheck disable=SC1091
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 EPHEMERAL=(
diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index 6fe2fc210d3..db28cf7d77a 100644
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -2,6 +2,9 @@
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh
index 338efcca8bc..47b28a7aa6d 100644
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -5,7 +5,11 @@
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_BUILD_TAG
 
-set -ex
+set -e
+
+. .gitlab-ci/setup-test-env.sh
+
+set -x
 
 EPHEMERAL=(
     autoconf
diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh
index 89d25326276..de42440aa8e 100644
--- a/.gitlab-ci/container/debian/arm64_build.sh
+++ b/.gitlab-ci/container/debian/arm64_build.sh
@@ -2,6 +2,9 @@
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 export LLVM_VERSION="${LLVM_VERSION:=15}"
diff --git a/.gitlab-ci/container/debian/baremetal_arm_test.sh b/.gitlab-ci/container/debian/baremetal_arm_test.sh
index c4f35a3d470..3849dd52404 100644
--- a/.gitlab-ci/container/debian/baremetal_arm_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm_test.sh
@@ -6,6 +6,9 @@
 # KERNEL_ROOTFS_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 ############### Install packages for baremetal testing
diff --git a/.gitlab-ci/container/debian/s390x_build.sh b/.gitlab-ci/container/debian/s390x_build.sh
index adabfd0e483..07cc9c7206a 100644
--- a/.gitlab-ci/container/debian/s390x_build.sh
+++ b/.gitlab-ci/container/debian/s390x_build.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+. .gitlab-ci/setup-test-env.sh
+
 arch=s390x
 
 # Ephemeral packages (installed for this script and removed again at the end)
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
index 7b7ba5cdaac..db136344345 100644
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -6,6 +6,9 @@
 # DEBIAN_BUILD_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh
index 2bac23b5a87..5b102294ed9 100644
--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ b/.gitlab-ci/container/debian/x86_64_build.sh
@@ -6,6 +6,9 @@
 # DEBIAN_BUILD_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
diff --git a/.gitlab-ci/container/debian/x86_64_pyutils.sh b/.gitlab-ci/container/debian/x86_64_pyutils.sh
index 94be8fd3265..b940e4e2e28 100644
--- a/.gitlab-ci/container/debian/x86_64_pyutils.sh
+++ b/.gitlab-ci/container/debian/x86_64_pyutils.sh
@@ -6,6 +6,9 @@
 # DEBIAN_PYUTILS_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 11ee7a4904f..a09d6e7f791 100644
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -3,6 +3,9 @@
 # shellcheck disable=SC1091
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
index c82b13705a2..3921e2dfea1 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -6,6 +6,9 @@
 # FEDORA_X86_64_BUILD_TAG
 
 set -e
+
+. .gitlab-ci/setup-test-env.sh
+
 set -o xtrace
 
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 1e884b48863..02c849ba4a2 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -13,10 +13,10 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20241120-gold-mold"
+   DEBIAN_BASE_TAG: "20241122-sections"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20241106-wlproto2"
+   DEBIAN_BUILD_TAG: "20241122-sections"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -35,9 +35,10 @@ variables:
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"
 
-   ALPINE_X86_64_BUILD_TAG: "20241120-gold-mold"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20241106-wlproto2"
-   FEDORA_X86_64_BUILD_TAG: "20241120-gold-mold"
+   ALPINE_X86_64_BUILD_TAG: "20241122-sections"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20241122-sections"
+   FEDORA_X86_64_BUILD_TAG: "20241122-sections"
+
    KERNEL_TAG: "v6.6.21-mesa-f8ea"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "bca9635d"