diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index 68521a66501..a92753ca4f5 100644
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -54,6 +54,9 @@ add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-1
 apt-get update
 apt-get dist-upgrade -y
 
+apt-get install -y \
+      sysvinit-core
+
 apt-get install -y --no-remove \
       git \
       git-lfs \
@@ -83,7 +86,6 @@ apt-get install -y --no-remove \
       python3-six \
       python3-yaml \
       socat \
-      sysvinit-core \
       vulkan-tools \
       waffle-utils \
       wget \
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 684b104496d..2ab949272d6 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,9 +1,9 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-08-27-drop-wine32"
+   DEBIAN_BASE_TAG: "2022-09-07-ci-templates"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-07-29-s390xxx"
+   DEBIAN_BUILD_TAG: "2022-09-07-ci-templates"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"
@@ -11,11 +11,11 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-08-30-piglit-update-0"
-   DEBIAN_X86_TEST_VK_TAG: "2022-08-30-piglit-update-0"
+   DEBIAN_X86_TEST_GL_TAG: "2022-09-07-ci-templates"
+   DEBIAN_X86_TEST_VK_TAG: "2022-09-07-ci-templates"
 
    FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck"
-   KERNEL_ROOTFS_TAG: "2022-08-30-piglit-update-0"
+   KERNEL_ROOTFS_TAG: "2022-09-07-ci-templates"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-08-17-bump"