diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2819e0f01d6..93f4cbf89e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ default:
 
 include:
   - project: 'freedesktop/ci-templates'
-    ref: 34f4ade99434043f88e164933f570301fd18b125
+    ref: ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
     file:
       - '/templates/ci-fairy.yml'
   - project: 'freedesktop/ci-templates'
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 74614cac6a6..8ead0f4c1d9 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -123,7 +123,7 @@ fi
 
 # Needed for ci-fairy, this revision is able to upload files to
 # MinIO and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 # Needed for manipulation with traces yaml files.
 pip3 install yq
diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh
index df66f949858..3ee9dea8ba9 100644
--- a/.gitlab-ci/container/debian/arm_build.sh
+++ b/.gitlab-ci/container/debian/arm_build.sh
@@ -68,7 +68,7 @@ apt-get -y install \
 apt-get install -y --no-remove -t buster \
         android-sdk-ext4-utils
 
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 arch=armhf
 . .gitlab-ci/container/cross_build.sh
diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
index fde9bc0363f..92d21d2e6c2 100644
--- a/.gitlab-ci/container/debian/x86_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_build-base.sh
@@ -76,7 +76,7 @@ apt-get install -y --no-remove \
 	zstd
 
 # Needed for ci-fairy, this revision is able to upload files to MinIO
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 # We need at least 0.61.4 for proper Rust
 pip3 install meson==0.61.5
diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index cb5ba61d114..36a392f267e 100644
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -118,7 +118,7 @@ mkdir -p /lava-files/
 
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 # and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
+pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 # Needed for manipulation with traces yaml files.
 pip3 install yq
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 7355c9bd6c9..39cc01dbde6 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-10-19-remove-xvmc-dev"
+   DEBIAN_BASE_TAG: "2022-11-03-ci-fairy-s3"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-10-22-mold-1_6"
+   DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va"
@@ -11,8 +11,8 @@ 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-10-20-bindgen-zlib-cve"
-   DEBIAN_X86_TEST_VK_TAG: "2022-11-03-vkd3d-proton"
+   DEBIAN_X86_TEST_GL_TAG: "2022-11-04-cts-zlib-cve"
+   DEBIAN_X86_TEST_VK_TAG: "2022-11-04-cts-vkd3d-proton"
 
    FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
    KERNEL_ROOTFS_TAG: "2022-11-03-piglit"