diff --git a/SEPolicy.mk b/SEPolicy.mk
index 7ecfc79..b9578bb 100644
--- a/SEPolicy.mk
+++ b/SEPolicy.mk
@@ -1,11 +1,16 @@
 # Board specific SELinux policy variable definitions
 MTK_SEPOLICY_PATH := device/mediatek/sepolicy_vndr
 
+ifeq ($(BOARD_MTK_SEPOLICY_IS_LEGACY), true)
 # Build with broken namespaces
 # Userspace blobs are still dependent older props that
 # do not pass the VTS test cases.
 BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
 
+BOARD_VENDOR_SEPOLICY_DIRS += \
+    $(MTK_SEPOLICY_PATH)/legacy/non_plat
+endif
+
 BOARD_VENDOR_SEPOLICY_DIRS += \
     $(MTK_SEPOLICY_PATH)/basic/non_plat \
     $(MTK_SEPOLICY_PATH)/basic/debug/non_plat \
diff --git a/basic/non_plat/property_contexts b/basic/non_plat/property_contexts
index 6aca195..33f4c36 100644
--- a/basic/non_plat/property_contexts
+++ b/basic/non_plat/property_contexts
@@ -403,9 +403,5 @@ persist.vendor.eara_io.          u:object_r:vendor_mtk_eara_io_prop:s0
 persist.vendor.mdrsra_v2_support u:object_r:vendor_mtk_mdrsra_v2_support_prop:s0
 persist.vendor.xfrm_support u:object_r:vendor_mtk_xfrm_support_prop:s0
 
-mtk.vendor.omx.core.log         u:object_r:vendor_mtk_omx_core_prop:s0
-ro.mtk_crossmount_support       u:object_r:vendor_mtk_crossmount_prop:s0
-ro.mtk_deinterlace_support      u:object_r:vendor_mtk_deinterlace_prop:s0
-
 # Thermal
 vendor.thermal. u:object_r:vendor_thermal_prop:s0
diff --git a/bsp/non_plat/property_contexts b/bsp/non_plat/property_contexts
index 1695446..2c3e57c 100644
--- a/bsp/non_plat/property_contexts
+++ b/bsp/non_plat/property_contexts
@@ -196,8 +196,6 @@ ro.vendor.mtk_vibspk_support u:object_r:vendor_mtk_default_prop:s0
 # fm 50khz support
 ro.vendor.mtk_fm_50khz_support u:object_r:vendor_mtk_default_prop:s0
 
-debuglog.drv                          u:object_r:vendor_mtk_camera_prop:s0
-debuglog.drv.                         u:object_r:vendor_mtk_camera_prop:s0
 vendor.camera.save.temp.video         u:object_r:vendor_mtk_camera_prop:s0
 vendor.camera_af_power_debug          u:object_r:vendor_mtk_camera_prop:s0
 vendor.com.mediatek.gesture.pose      u:object_r:vendor_mtk_camera_prop:s0
@@ -256,7 +254,6 @@ ro.vendor.mtk_ct4greg_app u:object_r:vendor_mtk_default_prop:s0
 ro.vendor.mtk_devreg_app  u:object_r:vendor_mtk_default_prop:s0
 
 vendor.cdma. u:object_r:vendor_mtk_cdma_prop:s0
-ril.cdma.inecmmode u:object_r:vendor_mtk_cdma_prop:s0
 
 persist.vendor.service.rcs        u:object_r:vendor_mtk_service_rcs_prop:s0
 persist.vendor.service.tag.rcs    u:object_r:vendor_mtk_service_rcs_prop:s0
diff --git a/legacy/non_plat/property_contexts b/legacy/non_plat/property_contexts
new file mode 100644
index 0000000..ee6318b
--- /dev/null
+++ b/legacy/non_plat/property_contexts
@@ -0,0 +1,7 @@
+mtk.vendor.omx.core.log         u:object_r:vendor_mtk_omx_core_prop:s0
+ro.mtk_crossmount_support       u:object_r:vendor_mtk_crossmount_prop:s0
+ro.mtk_deinterlace_support      u:object_r:vendor_mtk_deinterlace_prop:s0
+
+debuglog.drv                    u:object_r:vendor_mtk_camera_prop:s0
+debuglog.drv.                   u:object_r:vendor_mtk_camera_prop:s0
+ril.cdma.inecmmode              u:object_r:vendor_mtk_cdma_prop:s0