diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index 45e49741b31..9adfcdaaa38 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+# DEBIAN_TEST_GL_TAG
+# DEBIAN_TEST_VK_TAG
+# KERNEL_ROOTFS_TAG
+
 set -uex
 
 uncollapsed_section_start crosvm "Building crosvm"
@@ -8,7 +15,7 @@ uncollapsed_section_start crosvm "Building crosvm"
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
-CROSVM_VERSION=1641c55bcc922588e24de73e9cca7b5e4005bd6d
+CROSVM_VERSION=2118fbb57ca26b495a9aa407845c7729d697a24b
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 02c849ba4a2..e66baf9b434 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -13,7 +13,7 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20241122-sections"
+   DEBIAN_BASE_TAG: "20241125-crosvm"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
    DEBIAN_BUILD_TAG: "20241122-sections"
@@ -28,9 +28,9 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20241121-deqp-main"
-   DEBIAN_TEST_GL_TAG: "20241121-deqp-main"
-   DEBIAN_TEST_VK_TAG: "20241121-deqp-main"
-   KERNEL_ROOTFS_TAG: "20241121-deqp-main"
+   DEBIAN_TEST_GL_TAG: "20241125-crosvm"
+   DEBIAN_TEST_VK_TAG: "20241125-crosvm"
+   KERNEL_ROOTFS_TAG: "20241125-crosvm"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"