diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff9d2734c48..1081793cda5 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-09-deqp-version"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-09-db410c-net"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index ecb160d6457..e42363e8981 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -158,6 +158,10 @@ if [ -n "$INSTALL_KERNEL_MODULES" ]; then
     sed -i 's/=m/=n/g' ${DEFCONFIG}
 fi
 
+# Force db410c to host mode instead of OTG (which is otherwise selected by
+# default due to our micro cable for fastboot)
+sed -i 's/dr_mode = "otg"/dr_mode = "host"/' arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
 for image in ${KERNEL_IMAGE_NAME}; do