diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73e103482e3..9ad2268d7d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -414,7 +414,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-03-deqp-runner"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-09-kmod"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 1d2be14cd22..ecb160d6457 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -153,8 +153,10 @@ for i in /usr/bin/*-ld /usr/bin/ld; do
 done
 export PATH=`pwd`/ld-links:$PATH
 
-# Disable all modules in defconfig, so we only build the ones we want
-sed -i 's/=m/=n/g' ${DEFCONFIG}
+if [ -n "$INSTALL_KERNEL_MODULES" ]; then
+    # Disable all modules in defconfig, so we only build the ones we want
+    sed -i 's/=m/=n/g' ${DEFCONFIG}
+fi
 
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
@@ -167,8 +169,10 @@ if [[ -n ${DEVICE_TREES} ]]; then
     cp ${DEVICE_TREES} /lava-files/.
 fi
 
-make modules
-INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+if [ -n "$INSTALL_KERNEL_MODULES" ]; then
+    make modules
+    INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+fi
 
 if [[ ${DEBIAN_ARCH} = "arm64" ]] && which mkimage > /dev/null; then
     make Image.lzma
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index e7cf14c8512..ad86b4d21d8 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-11-05-deqp-runner"
+  DISTRIBUTION_TAG: "2020-11-09-kmod-fix"
 
 .kernel+rootfs:
   stage: container-2
@@ -9,6 +9,7 @@ variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
     UPLOAD_FOR_LAVA: 1
+    INSTALL_KERNEL_MODULES: 1
   script:
     - .gitlab-ci/container/lava_build.sh