diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh
index 0f9883721a2..81a77f9a9e8 100644
--- a/.gitlab-ci/container/debian/arm_build.sh
+++ b/.gitlab-ci/container/debian/arm_build.sh
@@ -22,6 +22,7 @@ apt-get -y install \
 	flex \
 	g++ \
 	git \
+	glslang-tools \
 	kmod \
 	libasan6 \
 	libdrm-dev \
diff --git a/.gitlab-ci/container/fedora/x86_build.sh b/.gitlab-ci/container/fedora/x86_build.sh
index e1841cfec1f..b11b7ca064d 100644
--- a/.gitlab-ci/container/fedora/x86_build.sh
+++ b/.gitlab-ci/container/fedora/x86_build.sh
@@ -25,6 +25,7 @@ dnf install -y --setopt=install_weak_deps=False \
     gcc \
     gcc-c++ \
     gettext \
+    glslang \
     kernel-headers \
     llvm-devel \
     clang-devel \
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9765c199e1f..2189fbdbd19 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-02-21-libdrm"
+   DEBIAN_BASE_TAG: "2022-04-24-libdrm"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-02-21-libdrm"
+   DEBIAN_BUILD_TAG: "2022-04-24-libdrm"
 
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
@@ -11,7 +11,7 @@ variables:
    DEBIAN_X86_TEST_GL_TAG: "2022-04-07-virgl-crosvm"
    DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner"
 
-   FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
+   FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
    KERNEL_ROOTFS_TAG: "2022-04-09-prefix-skqp"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"