diff --git a/build.config.aarch64 b/build.config.aarch64
index acbba39fbec2..15d2c0f83aea 100644
--- a/build.config.aarch64
+++ b/build.config.aarch64
@@ -4,8 +4,12 @@ CLANG_TRIPLE=aarch64-linux-gnu-
 CROSS_COMPILE=aarch64-linux-androidkernel-
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
 
+MAKE_GOALS="
+Image
+modules
+"
+
 FILES="
-arch/arm64/boot/Image.gz
 arch/arm64/boot/Image
 vmlinux
 System.map
diff --git a/build.config.arm b/build.config.arm
index 8eb547e21593..7f71449bf0b8 100644
--- a/build.config.arm
+++ b/build.config.arm
@@ -4,8 +4,12 @@ CLANG_TRIPLE=arm-linux-gnueabi-
 CROSS_COMPILE=arm-linux-androidkernel-
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
 
+MAKE_GOALS="
+Image
+modules
+"
+
 FILES="
-arch/arm/boot/Image.gz
 arch/arm/boot/Image
 vmlinux
 System.map
diff --git a/build.config.db845c b/build.config.db845c
index 65b768fb1fb3..573b1f839e69 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -5,7 +5,12 @@ DEFCONFIG=db845c_gki_defconfig
 PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/arch/arm64/configs/db845c_gki.fragment > ./common/arch/arm64/configs/${DEFCONFIG};"
 POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}"
 
-FILES="
+MAKE_GOALS="${MAKE_GOALS}
+qcom/sdm845-db845c.dtb
+Image.gz
+"
+
+FILES="${FILES}
 arch/arm64/boot/Image.gz
 arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 "
diff --git a/build.config.x86_64 b/build.config.x86_64
index df73a47e7220..452554915122 100644
--- a/build.config.x86_64
+++ b/build.config.x86_64
@@ -4,6 +4,11 @@ CLANG_TRIPLE=x86_64-linux-gnu-
 CROSS_COMPILE=x86_64-linux-androidkernel-
 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin
 
+MAKE_GOALS="
+bzImage
+modules
+"
+
 FILES="
 arch/x86/boot/bzImage
 vmlinux