diff --git a/BUILD.bazel b/BUILD.bazel
index ebd17bef8473..644e9ef07840 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -96,6 +96,11 @@ define_db845c(
     define_abi_targets = True,
     kmi_symbol_list = "//common:android/abi_gki_aarch64_db845c",
     kmi_symbol_list_add_only = True,
+    make_goals = [
+        "modules",
+        "qcom/sdm845-db845c.dtb",
+        "qcom/qrb5165-rb5.dtb",
+    ],
     module_outs = [
         # keep sorted
         "crypto/michael_mic.ko",
@@ -277,6 +282,11 @@ kernel_build(
     build_config = "build.config.rockpi4",
     collect_unstripped_modules = True,
     kmi_symbol_list = "//common:android/abi_gki_rockpi4",
+    make_goals = [
+        "Image",
+        "modules",
+        "rockchip/rk3399-rock-pi-4b.dtb",
+    ],
     module_outs = COMMON_GKI_MODULES_LIST + [
         # keep sorted
         "drivers/block/virtio_blk.ko",
diff --git a/build.config.db845c b/build.config.db845c
index 3da01aca6cd5..beac03ff11b1 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -7,12 +7,6 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
 PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
-MAKE_GOALS="
-modules
-qcom/sdm845-db845c.dtb
-qcom/qrb5165-rb5.dtb
-"
-
 FILES="
 arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
diff --git a/build.config.rockpi4 b/build.config.rockpi4
index 9556f01e3f2c..98f56a18cc20 100644
--- a/build.config.rockpi4
+++ b/build.config.rockpi4
@@ -10,12 +10,6 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/rockpi4_gki.fragment
 PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
-MAKE_GOALS="
-Image
-modules
-rockchip/rk3399-rock-pi-4b.dtb
-"
-
 FILES="${FILES}
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dtb
 "