diff --git a/kalama_oemvm.bzl b/kalama_oemvm.bzl
new file mode 100644
index 000000000000..71975fc9f812
--- /dev/null
+++ b/kalama_oemvm.bzl
@@ -0,0 +1,12 @@
+load(":target_variants.bzl", "vm_variants")
+load(":msm_kernel_vm.bzl", "define_msm_vm")
+
+target_name = "kalama-oemvm"
+
+def define_kalama_oemvm():
+    for variant in vm_variants:
+        define_msm_vm(
+            msm_target = target_name,
+            variant = variant,
+            defconfig = "kalama_tuivm",
+        )
diff --git a/msm_kernel_vm.bzl b/msm_kernel_vm.bzl
index da4cd34e0da2..cfb1a2f2e7a2 100644
--- a/msm_kernel_vm.bzl
+++ b/msm_kernel_vm.bzl
@@ -29,6 +29,7 @@ def _define_build_config(
         msm_target,
         variant,
         target,
+        defconfig = None,
         vm_image_opts = vm_image_opts(),
         build_config_fragments = []):
     """Creates a kernel_build_config for an MSM target
@@ -43,6 +44,11 @@ def _define_build_config(
       build_config_fragments: build.config fragments to embed
     """
 
+    if defconfig:
+        msm_arch = defconfig
+    else:
+        msm_arch = msm_target.replace("-", "_")
+
     gen_config_command = """
       cat << 'EOF' > "$@"
 KERNEL_DIR="msm-kernel"
@@ -63,7 +69,7 @@ DUMMY_IMG_SIZE=%d
 EOF
     """ % (
         " ".join([v.replace("-", "_") for v in vm_variants]), # VARIANTS
-        msm_target.replace("-", "_"), # MSM_ARCH
+        msm_arch, # MSM_ARCH
         variant.replace("-", "_"), # VARIANT
         vm_image_opts.preferred_usespace, # PREFERED_USERSPACE
         int(vm_image_opts.vm_dtb_img_create), # VM_DTB_IMG_CREATE
@@ -213,6 +219,7 @@ def _define_kernel_dist(target):
 def define_msm_vm(
         msm_target,
         variant,
+        defconfig = None,
         define_compile_commands = False,
         vm_image_opts = vm_image_opts()):
     """Top-level kernel build definition macro for a VM MSM platform
@@ -240,6 +247,7 @@ def define_msm_vm(
         msm_target,
         variant,
         target,
+        defconfig,
         vm_image_opts = vm_image_opts,
         build_config_fragments = build_config_fragments,
     )
diff --git a/msm_platforms.bzl b/msm_platforms.bzl
index ac6e7554a7c1..b592ea28d612 100644
--- a/msm_platforms.bzl
+++ b/msm_platforms.bzl
@@ -1,12 +1,16 @@
 load(":kalama.bzl", "define_kalama")
 load(":kalama_tuivm.bzl", "define_kalama_tuivm")
+load(":kalama_oemvm.bzl", "define_kalama_oemvm")
 load(":pineapple.bzl", "define_pineapple")
 load(":pineapple_tuivm.bzl", "define_pineapple_tuivm")
+load(":pineapple_oemvm.bzl", "define_pineapple_oemvm")
 load("//build:msm_kernel_extensions.bzl", "define_top_level_rules")
 
 def define_msm_platforms():
     define_top_level_rules()
     define_kalama()
     define_kalama_tuivm()
+    define_kalama_oemvm()
     define_pineapple()
     define_pineapple_tuivm()
+    define_pineapple_oemvm()
diff --git a/pineapple_oemvm.bzl b/pineapple_oemvm.bzl
new file mode 100644
index 000000000000..0decbb7d4f1d
--- /dev/null
+++ b/pineapple_oemvm.bzl
@@ -0,0 +1,12 @@
+load(":target_variants.bzl", "vm_variants")
+load(":msm_kernel_vm.bzl", "define_msm_vm")
+
+target_name = "pineapple-oemvm"
+
+def define_pineapple_oemvm():
+    for variant in vm_variants:
+        define_msm_vm(
+            msm_target = target_name,
+            variant = variant,
+            defconfig = "pineapple_tuivm",
+        )
diff --git a/target_variants.bzl b/target_variants.bzl
index eda56ecb4979..6bf58aecd849 100644
--- a/target_variants.bzl
+++ b/target_variants.bzl
@@ -12,7 +12,7 @@ la_variants = [
 
 vm_types = [
     "tuivm",
-    #    "oemvm",
+    "oemvm",
 ]
 
 vm_targets = ["{}-{}".format(t, vt) for t in targets for vt in vm_types]