diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 965bf179001..65804d28642 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -47,7 +47,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     DEVICE_TREES+=" apq8016-sbc.dtb"
     DEVICE_TREES+=" apq8096-db820c.dtb"
     DEVICE_TREES+=" sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
-    DEVICE_TREES+=" sc7180-trogdor-kingoftown-r1.dtb"
+    DEVICE_TREES+=" sc7180-trogdor-kingoftown.dtb"
     DEVICE_TREES+=" sm8350-hdk.dtb"
     KERNEL_IMAGE_NAME="Image"
 
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index e613d681e91..e2abdc2b3ee 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -312,12 +312,12 @@ a530-traces:
     GPU_VERSION: freedreno-a618
     VK_DRIVER: freedreno
 
-.a618-test-kingoftown-r1:
+.a618-test-kingoftown:
   extends:
     - .a618-test
   variables:
     DEVICE_TYPE: sc7180-trogdor-kingoftown
-    DTB: sc7180-trogdor-kingoftown-r1
+    DTB: sc7180-trogdor-kingoftown
     RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown
 
 .a618-test-limozeen-nots-r5:
@@ -331,7 +331,7 @@ a530-traces:
 a618_vk:
   extends:
     - .lava-test-deqp:arm64
-    - .a618-test-kingoftown-r1
+    - .a618-test-kingoftown
     - .collabora-turnip-rules
   parallel: 12
   variables: