diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index fcd13de3e5d..a10a86668fe 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -31,7 +31,7 @@ if [[ $arch == "arm64" ]]; then
         -O "${KERNEL_IMAGE_BASE}"/arm64/cheza-kernel
 
     DEVICE_TREES=""
-    DEVICE_TREES="$DEVICE_TREES apq8016-sbc.dtb"
+    DEVICE_TREES="$DEVICE_TREES apq8016-sbc-usb-host.dtb"
     DEVICE_TREES="$DEVICE_TREES apq8096-db820c.dtb"
     DEVICE_TREES="$DEVICE_TREES tegra210-p3450-0000.dtb"
     DEVICE_TREES="$DEVICE_TREES imx8mq-nitrogen.dtb"
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index bbb6c2356f0..8917a51812f 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -50,7 +50,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     DEVICE_TREES+=" mt8192-asurada-spherion-r0.dtb"
     DEVICE_TREES+=" mt8183-kukui-jacuzzi-juniper-sku16.dtb"
     DEVICE_TREES+=" tegra210-p3450-0000.dtb"
-    DEVICE_TREES+=" apq8016-sbc.dtb"
+    DEVICE_TREES+=" apq8016-sbc-usb-host.dtb"
     DEVICE_TREES+=" apq8096-db820c.dtb"
     DEVICE_TREES+=" sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
     DEVICE_TREES+=" sc7180-trogdor-kingoftown.dtb"
diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index eb75b4f894e..31cbd71706f 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -307,8 +307,8 @@
     - .google-freedreno-test
   variables:
     BM_KERNEL: Image.gz
-    BM_DTB: apq8016-sbc
-    DEVICE_TYPE: apq8016-sbc
+    BM_DTB: apq8016-sbc-usb-host
+    DEVICE_TYPE: apq8016-sbc-usb-host
     GPU_VERSION: freedreno-a307
   timeout: 20m
   tags: