diff --git a/build.config.msm.gen3auto b/build.config.msm.gen3auto
new file mode 100644
index 000000000000..b446535b5e3e
--- /dev/null
+++ b/build.config.msm.gen3auto
@@ -0,0 +1,39 @@
+################################################################################
+## Inheriting configs from ACK
+. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/common/build.config.aarch64
+
+################################################################################
+## Variant setup
+MSM_ARCH=gen3auto
+VARIANTS=(consolidate gki)
+[ -z "${VARIANT}" ] && VARIANT=gki
+
+if [ -e "${ROOT_DIR}/msm-kernel" -a "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
+ABL_SRC=bootable/bootloader/edk2
+BOOT_IMAGE_HEADER_VERSION=4
+BASE_ADDRESS=0x80000000
+PAGE_SIZE=4096
+BUILD_VENDOR_DLKM=1
+SUPER_IMAGE_SIZE=0x10000000
+TRIM_UNUSED_MODULES=1
+PREPARE_SYSTEM_DLKM=1
+BUILD_INIT_BOOT_IMG=1
+SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
+MODULES_LIST_ORDER="1"
+
+[ -z "${DT_OVERLAY_SUPPORT}" ] && DT_OVERLAY_SUPPORT=1
+
+if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then
+	KERNEL_VENDOR_CMDLINE+=' console=ttyMSM0,115200n8 earlycon=qcom_geni,0xa90000 qcom_geni_serial.con_enabled=1 androidboot.first_stage_console=1 '
+fi
+
+KERNEL_VENDOR_CMDLINE+=' bootconfig '
+
+################################################################################
+## Inheriting MSM configs
+. ${KERNEL_DIR}/build.config.msm.common
+. ${KERNEL_DIR}/build.config.msm.gki
diff --git a/build.targets b/build.targets
index fd237e80c951..7dc5fdee5c4d 100644
--- a/build.targets
+++ b/build.targets
@@ -5,3 +5,4 @@ build.config.msm.pineapple.vm
 build.config.msm.kalama.vm
 build.config.msm.pineapple.allyes
 build.config.msm.blair
+build.config.msm.gen3auto