diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21e13dec080..40536b30467 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -447,8 +447,8 @@ kernel+rootfs_arm64-baremetal:
     - aarch64
   variables:
     DEBIAN_ARCH: "arm64"
-    KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-02-17-5.11.tar.gz"
-    MESA_ROOTFS_TAG: &arm-baremetal "2021-04-08-libdrm"
+    KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-04-01-5.11.tar.gz"
+    MESA_ROOTFS_TAG: &arm-baremetal "2021-04-12-kernel"
     MINIO_SUFFIX: "baremetal"
 
 # Kernel & rootfs for armhf baremetal testing
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 0297ebf4474..fb09c376d48 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -95,12 +95,9 @@ wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 # Strip the image to a small minimal system without removing the debian
 # toolchain.
 
-# xz compress firmware so it doesn't waste RAM at runtime.  Except db820c's
-# GPU firmware, due to using a precompiled kernel without compression support.
+# xz compress firmware so it doesn't waste RAM at runtime on ramdisk systems
 find /lib/firmware -type f -print0 | \
-    grep -vz a530 | \
     xargs -0r -P4 -n4 xz -T1 -C crc32
-ln -s /lib/firmware/qcom/a530* /lib/firmware/
 
 # Copy timezone file and remove tzdata package
 rm -rf /etc/localtime
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 7f93aa13678..aff94a4fdf5 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -14,7 +14,7 @@
   variables:
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
     INSTALL_KERNEL_MODULES: 1
-    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-08-libdrm"
+    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-12-kernel"
     MINIO_SUFFIX: "lava"
     PIGLIT_BUILD_TARGETS: "piglit_replayer"