diff --git a/build.config.msm.vm b/build.config.msm.vm
new file mode 100644
index 000000000000..b88e615db590
--- /dev/null
+++ b/build.config.msm.vm
@@ -0,0 +1,19 @@
+################################################################################
+# Common configuration for building kernel for Virtual Machines
+DEFCONFIG="generic_vm_defconfig"
+
+function build_defconfig_fragments() {
+	if [[ "${VARIANT}" =~ ^(defconfig|debug_defconfig)$ ]]; then
+		apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}.config vendor/${MSM_ARCH}_defconfig
+
+		if [ "${VARIANT}" = defconfig ]; then
+			return
+		fi
+
+		apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_debug.config vendor/${MSM_ARCH}-debug_defconfig
+	else
+		echo "Variant '${VARIANT}' unsupported by gki"
+		exit 1
+	fi
+}
+build_defconfig_fragments
diff --git a/build.config.msm.waipio.tuivm b/build.config.msm.waipio.tuivm
new file mode 100644
index 000000000000..390de1c50cf2
--- /dev/null
+++ b/build.config.msm.waipio.tuivm
@@ -0,0 +1,19 @@
+################################################################################
+## Inheriting configs from ACK
+. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/common/build.config.aarch64
+
+################################################################################
+## Variant setup
+MSM_ARCH=waipio_tuivm
+VARIANTS=(defconfig debug_defconfig)
+[ -z "${VARIANT}" ] && VARIANT=debug_defconfig
+
+BOOT_IMAGE_HEADER_VERSION=3
+BASE_ADDRESS=0x80000000
+PAGE_SIZE=4096
+
+################################################################################
+## Inheriting MSM configs
+. ${KERNEL_DIR}/build.config.msm.common
+. ${KERNEL_DIR}/build.config.msm.vm