diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20d1ad62e86..878134e3bef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -447,8 +447,8 @@ arm_build:
   stage: container-2
   variables:
     GIT_STRATEGY: fetch
-    KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-4a93e50f5c34/linux-v5.13-rc2-for-mesa-ci-4a93e50f5c34.tar.bz2"
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-19-piglit"
+    KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-2a4a4fa4407f/v5.13-rc2-for-mesa-ci-2a4a4fa4407f.tar.bz2"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-21-panfrost-oops"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh