diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index 9b8088344f0..05172fa45a7 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -2,13 +2,18 @@
 
 set -ex
 
-CROSVM_VERSION=f904b0ee258554bca9fed1b633b79e6d96003cf0
-git clone --single-branch -b for-mesa-ci --no-checkout https://gitlab.freedesktop.org/tintou/crosvm.git /platform/crosvm
+SCRIPT_DIR="$(pwd)"
+
+CROSVM_VERSION=c7cd0e0114c8363b884ba56d8e12adee718dcc93
+git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/chromiumos/platform/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
+# Apply all crosvm patches for Mesa CI
+cat "$SCRIPT_DIR"/.gitlab-ci/container/build-crosvm_*.patch |
+    patch -p1
 
-VIRGLRENDERER_VERSION=45070fae92d25a726d9ce10fc22c1f92270ecd35
+VIRGLRENDERER_VERSION=0564c9a0c2f584e004a7d4864aee3b8ec9692105
 rm -rf third_party/virglrenderer
 git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
diff --git a/.gitlab-ci/container/build-crosvm_no-syslog.patch b/.gitlab-ci/container/build-crosvm_no-syslog.patch
new file mode 100644
index 00000000000..804e90bb7f1
--- /dev/null
+++ b/.gitlab-ci/container/build-crosvm_no-syslog.patch
@@ -0,0 +1,43 @@
+From 3c57ec558bccc67fd53363c23deea20646be5c47 Mon Sep 17 00:00:00 2001
+From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+Date: Wed, 17 Nov 2021 10:18:04 +0100
+Subject: [PATCH] Hack syslog out
+
+It's causing stability problems when running several Crosvm instances in
+parallel.
+
+Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+---
+ base/src/unix/linux/syslog.rs       | 2 +-
+ common/sys_util/src/linux/syslog.rs | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/src/unix/linux/syslog.rs b/base/src/unix/linux/syslog.rs
+index 05972a3a..f0db3781 100644
+--- a/base/src/unix/linux/syslog.rs
++++ b/base/src/unix/linux/syslog.rs
+@@ -35,7 +35,7 @@ pub struct PlatformSyslog {
+ impl Syslog for PlatformSyslog {
+     fn new() -> Result<Self, Error> {
+         Ok(Self {
+-            socket: Some(openlog_and_get_socket()?),
++            socket: None,
+         })
+     }
+ 
+diff --git a/common/sys_util/src/linux/syslog.rs b/common/sys_util/src/linux/syslog.rs
+index 05972a3a..f0db3781 100644
+--- a/common/sys_util/src/linux/syslog.rs
++++ b/common/sys_util/src/linux/syslog.rs
+@@ -35,7 +35,7 @@ pub struct PlatformSyslog {
+ impl Syslog for PlatformSyslog {
+     fn new() -> Result<Self, Error> {
+         Ok(Self {
+-            socket: Some(openlog_and_get_socket()?),
++            socket: None,
+         })
+     }
+ 
+-- 
+2.25.1
+
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index f7b000f457a..861c2a501a6 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -8,7 +8,7 @@ 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-04-05-deqp-runner"
+   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"