diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7528432f996..3fa967f7070 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -455,7 +455,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-02-17-asan"
+    MESA_IMAGE_TAG: &arm64_test "2021-02-18-kernel"
 
 .use-arm64_test:
   extends:
@@ -472,7 +472,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-02-17-asan"
+    MESA_IMAGE_TAG: &armhf_test "2021-02-18-kernel"
 
 .use-armhf_test:
   extends:
diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config
index c9f18f97d0c..11e96174e94 100644
--- a/.gitlab-ci/container/arm64.config
+++ b/.gitlab-ci/container/arm64.config
@@ -45,6 +45,7 @@ CONFIG_PHY_QCOM_QUSB2=y
 CONFIG_PHY_QCOM_QMP=y
 CONFIG_QCOM_LLCC=y
 CONFIG_QCOM_SPMI_TEMP_ALARM=y
+CONFIG_QCOM_CLK_APCC_MSM8996=y
 CONFIG_POWER_RESET_QCOM_PON=y
 CONFIG_RTC_DRV_PM8XXX=y
 CONFIG_INTERCONNECT=y
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index df60f94fac5..0305a5057c2 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/austriancoder/linux/archive/mesa-ci-2021-02-15-5.11.tar.gz
+KERNEL_URL=https://github.com/anholt/linux/archive/mesa-ci-2021-02-17-5.11.tar.gz
 
 DEBIAN_ARCH=$arch . .gitlab-ci/container/lava_build.sh
 
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 36c5c1840fd..b6c5ecc821d 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -24,7 +24,13 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     GCC_ARCH="aarch64-linux-gnu"
     KERNEL_ARCH="arm64"
     DEFCONFIG="arch/arm64/configs/defconfig"
-    DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
+    DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
     KERNEL_IMAGE_NAME="Image"
 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     GCC_ARCH="arm-linux-gnueabihf"
diff --git a/ci-expects/freedreno/deqp-freedreno-a530-fails.txt b/ci-expects/freedreno/deqp-freedreno-a530-fails.txt
index d399b24ccf8..8671f627187 100644
--- a/ci-expects/freedreno/deqp-freedreno-a530-fails.txt
+++ b/ci-expects/freedreno/deqp-freedreno-a530-fails.txt
@@ -14,7 +14,6 @@ dEQP-GLES3.functional.transform_feedback.array.interleaved.points.highp_mat3x2,F
 dEQP-GLES3.functional.transform_feedback.array.separate.lines.highp_mat3x4,Fail
 dEQP-GLES3.functional.transform_feedback.array.separate.points.lowp_mat2,Fail
 dEQP-GLES3.functional.transform_feedback.array.separate.points.mediump_uint,Fail
-dEQP-GLES3.functional.transform_feedback.array.separate.triangles.lowp_vec3,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.interleaved.lines.highp_uvec4,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.interleaved.points.highp_vec2,Fail
 dEQP-GLES3.functional.transform_feedback.array_element.interleaved.points.lowp_ivec3,Fail
diff --git a/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt b/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt
index 071342b79c0..91dfb4c2cae 100644
--- a/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt
+++ b/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt
@@ -7,6 +7,9 @@ dEQP-GLES3.functional.texture.filtering.3d.*
 dEQP-GLES3.functional.texture.vertex.3d.filtering.*
 dEQP-GLES31.functional.ubo.2_level_struct_array.single_buffer.packed_instance_array_fragment
 
+# unstable results once we enabled SMP -- some state not being reset reliably?
+dEQP-GLES3.functional.transform_feedback.interpolation.smooth.highp_vec4_triangles_separate
+
 # These are in the xfails list (they usually do), but the random
 # behavior occasionally results in UnexpectedPass results.
 dEQP-GLES31.functional.separate_shader.random.99
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 178fefdd081..37626464c6a 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -66,12 +66,9 @@ a306_gles3_options:
   extends:
     - .freedreno-test
   variables:
-    BM_KERNEL: /lava-files/db820c-kernel
-    BM_DTB: /lava-files/db820c.dtb
-    # Disable SMP because only CPU 0 is at a freq higher than 19mhz on
-    # current upstream kernel.
-    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 nosmp"
-    FDO_CI_CONCURRENT: 1
+    BM_KERNEL: /lava-files/Image.gz
+    BM_DTB: /lava-files/apq8096-db820c.dtb
+    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
     GPU_VERSION: freedreno-a530
     DEQP_EXPECTED_RENDERER: FD530
   tags:
@@ -108,8 +105,6 @@ a530_gles31:
   variables:
     BARE_METAL_TEST_SCRIPT: "/install/piglit/run.sh"
     BM_START_XORG: 1
-    # SMP is disabled in the current kernels for db820c.
-    FDO_CI_CONCURRENT: 1
     # Excluding for flakes in multisample (MSAA fails covered well by deqp, we
     # can enable it once we stabilize that.) and other flakes from
     # atomic_counters through userclip in the list.