diff --git a/build.config.msm.niobe.tuivm b/build.config.msm.niobe.tuivm
new file mode 100644
index 000000000000..ffc02500445c
--- /dev/null
+++ b/build.config.msm.niobe.tuivm
@@ -0,0 +1,9 @@
+################################################################################
+## Inheriting MSM configs
+. "${KERNEL_DIR}"/build.config.msm.niobe.vm
+################################################################################
+
+MKDTIMGDTBS=()
+MKDTIMGDTBS["niobe_tuivm"]="niobe-vm"
+
+################################################################################
diff --git a/build.config.msm.niobe.vm b/build.config.msm.niobe.vm
new file mode 100644
index 000000000000..cf2d131b97a0
--- /dev/null
+++ b/build.config.msm.niobe.vm
@@ -0,0 +1,36 @@
+################################################################################
+## Inheriting configs from ACK
+. "${ROOT_DIR}"/common/build.config.common
+. "${ROOT_DIR}"/common/build.config.aarch64
+
+################################################################################
+## Variant setup
+MSM_ARCH=niobe_tuivm
+VARIANTS=(defconfig debug_defconfig)
+[ -z "${VARIANT}" ] && VARIANT=debug_defconfig
+
+if [ -e "${ROOT_DIR}/msm-kernel" ] && [ "${KERNEL_DIR}" = "common" ]; then
+	KERNEL_DIR="msm-kernel"
+fi
+
+BOOT_IMAGE_HEADER_VERSION=3
+BASE_ADDRESS=0x80000000
+PAGE_SIZE=4096
+VM_DTB_IMG_CREATE=1
+PREFERRED_USERSPACE=vm
+
+declare -A MKDTIMGDTBS
+
+################################################################################
+## Define TUI VM parameters
+TUIVM_KERNEL_OFFSET=0x0
+TUIVM_DTB_OFFSET=0x2000000
+TUIVM_RAMDISK_OFFSET=0x2100000
+TUIVM_CMDLINE_CPIO_OFFSET=0x2100000
+
+MKDTIMGDTBS["niobe_tuivm"]="niobe-vm"
+
+################################################################################
+## Inheriting MSM configs
+. "${KERNEL_DIR}"/build.config.msm.common
+. "${KERNEL_DIR}"/build.config.msm.vm
diff --git a/build.targets b/build.targets
index bf489b5de4a7..b518ee1df568 100644
--- a/build.targets
+++ b/build.targets
@@ -5,6 +5,7 @@ build.config.msm.niobe
 build.config.msm.kalama
 build.config.msm.pineapple.vm
 build.config.msm.kalama.vm
+build.config.msm.niobe.vm
 build.config.msm.pineapple.allyes
 build.config.msm.blair
 build.config.msm.gen3auto
diff --git a/msm_platforms.bzl b/msm_platforms.bzl
index 4cad2c5facda..a7e71f743bdc 100644
--- a/msm_platforms.bzl
+++ b/msm_platforms.bzl
@@ -10,6 +10,7 @@ load(":pineapple_tuivm.bzl", "define_pineapple_tuivm")
 load(":pineapple_oemvm.bzl", "define_pineapple_oemvm")
 load(":pineapple_vms.bzl", "define_pineapple_vms")
 load(":pineapple_allyes.bzl", "define_pineapple_allyes")
+load(":niobe_tuivm.bzl", "define_niobe_tuivm")
 load(":msm_common.bzl", "define_signing_keys")
 load("//build:msm_kernel_extensions.bzl", "define_top_level_rules")
 load(":blair.bzl", "define_blair")
@@ -30,5 +31,6 @@ def define_msm_platforms():
     define_pineapple_oemvm()
     define_pineapple_allyes()
     define_pineapple_vms()
+    define_niobe_tuivm()
     define_blair()
     define_pitti()
diff --git a/niobe_tuivm.bzl b/niobe_tuivm.bzl
new file mode 100644
index 000000000000..ed5f9cb71c3e
--- /dev/null
+++ b/niobe_tuivm.bzl
@@ -0,0 +1,11 @@
+load(":target_variants.bzl", "vm_variants")
+load(":msm_kernel_vm.bzl", "define_msm_vm")
+
+target_name = "niobe-tuivm"
+
+def define_niobe_tuivm():
+    for variant in vm_variants:
+        define_msm_vm(
+            msm_target = target_name,
+            variant = variant,
+        )
diff --git a/target_variants.bzl b/target_variants.bzl
index 35b5311cd1b1..9e38c0d4a683 100644
--- a/target_variants.bzl
+++ b/target_variants.bzl
@@ -43,11 +43,16 @@ vm_types = [
     "oemvm",
 ]
 
-vm_target_bases = [
-    "pineapple",
+niobe_vm_types = [
+    "tuivm",
 ]
 
-vm_targets = ["{}-{}".format(t, vt) for t in vm_target_bases for vt in vm_types]
+vm_target_bases = {
+    "pineapple": vm_types,
+    "niobe": niobe_vm_types,
+}
+
+vm_targets = ["{}-{}".format(t, vt) for t in vm_target_bases.keys() for vt in vm_target_bases[t]]
 
 vm_variants = [
     # keep sorted