diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74bd36431eb..425e6b6e8d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -446,8 +446,8 @@ arm_build:
   stage: container-2
   variables:
     GIT_STRATEGY: fetch
-    KERNEL_URL: "https://gitlab.freedesktop.org/bbrezillon/linux/-/archive/v5.11-for-mesa-ci-67aa5f8a239e/linux-v5.11-for-mesa-ci-67aa5f8a239e.tar.bz2"
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-04-21-panfrost-mmu-fix"
+    KERNEL_URL: "https://gitlab.freedesktop.org/drm/msm/-/archive/v5.11-for-mesa-ci-40abe2528d16/linux-v5.11-for-mesa-ci-40abe2528d16.tar.bz2"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-04-27-msm-fixes"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh