diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4573f2c78ca..6fab0ed0187 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -447,7 +447,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-02-11-vkglcts-1.2.5.1"
+    MESA_IMAGE_TAG: &arm64_test "2021-02-15-kernel"
 
 .use-arm64_test:
   extends:
@@ -464,7 +464,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-02-11-vkglcts-1.2.5.1"
+    MESA_IMAGE_TAG: &armhf_test "2021-02-15-kernel"
 
 .use-armhf_test:
   extends:
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index b3f5cb01a01..df60f94fac5 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -52,7 +52,7 @@ mkdir /var/cache/apt/archives/$arch
 . .gitlab-ci/container/container_pre_build.sh
 
 ############### Create rootfs
-KERNEL_URL=https://github.com/anholt/linux/archive/mesa-ci-2021-01-27-5.11rc5.tar.gz
+KERNEL_URL=https://github.com/austriancoder/linux/archive/mesa-ci-2021-02-15-5.11.tar.gz
 
 DEBIAN_ARCH=$arch . .gitlab-ci/container/lava_build.sh