diff --git a/build.config.msm.cinder b/build.config.msm.cinder
index 381b89ac89dc..2011e9fdb6bd 100644
--- a/build.config.msm.cinder
+++ b/build.config.msm.cinder
@@ -19,6 +19,7 @@ BASE_ADDRESS=0x9c300000
 PAGE_SIZE=4096
 DTB_IMG_CREATE=1
 TARGET_HAS_SEPARATE_RD=1
+PREFERRED_USERSPACE=le
 [ -z "${DT_OVERLAY_SUPPORT}" ] && DT_OVERLAY_SUPPORT=0
 
 if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then
diff --git a/build.config.msm.kalama.vm b/build.config.msm.kalama.vm
index 54f39758d2aa..46aca846beda 100644
--- a/build.config.msm.kalama.vm
+++ b/build.config.msm.kalama.vm
@@ -17,6 +17,7 @@ BOOT_IMAGE_HEADER_VERSION=3
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
 VM_DTB_IMG_CREATE=1
+PREFERRED_USERSPACE=vm
 
 declare -A MKDTIMGDTBS
 
diff --git a/build.config.msm.waipio.vm b/build.config.msm.waipio.vm
index 7787d46dd08b..9641670d9961 100644
--- a/build.config.msm.waipio.vm
+++ b/build.config.msm.waipio.vm
@@ -17,6 +17,7 @@ BOOT_IMAGE_HEADER_VERSION=3
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
 VM_DTB_IMG_CREATE=1
+PREFERRED_USERSPACE=vm
 
 declare -A MKDTIMGDTBS