diff --git a/sepolicy/vendor/cameraserver.te b/sepolicy/vendor/cameraserver.te
index 688515b84f367c1bbe200ebea4030632e25e4fd5..29816e36b8090b524c9aa06e7a3a7a3b2c53147a 100644
--- a/sepolicy/vendor/cameraserver.te
+++ b/sepolicy/vendor/cameraserver.te
@@ -1,9 +1,7 @@
 allow cameraserver init:unix_stream_socket connectto;
 allow cameraserver property_socket:sock_file write;
 
-# Prop policies
-get_prop(cameraserver, mtk_camera_prop)
+get_prop(cameraserver, vendor_mtk_camera_prop)
 get_prop(cameraserver, exported_default_prop)
 get_prop(cameraserver, vendor_audio_prop)
-get_prop(cameraserver, vendor_default_prop)
 set_prop(cameraserver, system_prop)
diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te
index fa6454abde62f55d06a6962036ccad127eaf9f5d..96836f8f816f4e5472333d2d4aa5d6d323046737 100644
--- a/sepolicy/vendor/file.te
+++ b/sepolicy/vendor/file.te
@@ -1,3 +1,3 @@
-type cmd_charge_disable, sysfs_type, fs_type, mlstrustedobject;
 type sysfs_light, fs_type, sysfs_type, mlstrustedobject;
 type sysfs_graphics, sysfs_type, fs_type, mlstrustedobject;
+type cmd_charge_disable, sysfs_type, fs_type, mlstrustedobject;
diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts
index ff862e4a41b9080b67e03ac073a339ef30c8edb6..c40f58a889f272cc4f632a7271521cc98ed65f95 100644
--- a/sepolicy/vendor/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
@@ -1 +1,2 @@
+# label for charge disabler
 genfscon sysfs /devices/platform/charger/cmd_charge_disable        u:object_r:cmd_charge_disable:s0
diff --git a/sepolicy/vendor/hal_fingerprint_default.te b/sepolicy/vendor/hal_fingerprint_default.te
index 33ffeb5ddc3815d988173193f0298b1d93ed1cf2..cf56e550f76119f5b50aeecb5b70cbbba4c458b1 100644
--- a/sepolicy/vendor/hal_fingerprint_default.te
+++ b/sepolicy/vendor/hal_fingerprint_default.te
@@ -1,9 +1,9 @@
 add_service(hal_fingerprint_default, hal_fingerprint_vndservice);
 vndbinder_use(hal_fingerprint_default);
 
+allow hal_fingerprint_default self:netlink_kobject_uevent_socket { bind create read setopt };
 allow hal_fingerprint_default fp_device:chr_file rw_file_perms;
+allow hal_fingerprint_default tee_device:chr_file rw_file_perms;
 allow hal_fingerprint_default input_device:dir r_dir_perms;
 allow hal_fingerprint_default input_device:chr_file rw_file_perms;
-allow hal_fingerprint_default self:netlink_kobject_uevent_socket { bind create read setopt };
-allow hal_fingerprint_default tee_device:chr_file rw_file_perms;
 allow hal_fingerprint_default uhid_device:chr_file rw_file_perms;
diff --git a/sepolicy/vendor/hal_wifi_default.te b/sepolicy/vendor/hal_wifi_default.te
index 28b1c998a0b679a6ff62842b7638b45e8a9c2883..bf6aab983f0f70dc51ef51b3562cc47449ae6f27 100644
--- a/sepolicy/vendor/hal_wifi_default.te
+++ b/sepolicy/vendor/hal_wifi_default.te
@@ -1 +1 @@
-set_prop(hal_wifi_default, wlan_fw_prop)
+set_prop(hal_wifi_default, vendor_wlan_fw_prop)
diff --git a/sepolicy/vendor/mediacodec.te b/sepolicy/vendor/mediacodec.te
index e55b769555c16126038450ed5fd0b9102f156862..c1f26bc715bf406b4bab4d4ce928bfd3f3ca64be 100644
--- a/sepolicy/vendor/mediacodec.te
+++ b/sepolicy/vendor/mediacodec.te
@@ -1 +1 @@
-get_prop(mediacodec, mtk_vdec_log_prop)
+get_prop(mediacodec, vendor_mtk_vdec_log_prop)
diff --git a/sepolicy/vendor/mtk_hal_audio.te b/sepolicy/vendor/mtk_hal_audio.te
index 21604b9e0dd021ef292efe8785a0e9a531ae209e..e337e5b19fbffef0bc3533510eb1256e034719fe 100644
--- a/sepolicy/vendor/mtk_hal_audio.te
+++ b/sepolicy/vendor/mtk_hal_audio.te
@@ -1 +1 @@
-get_prop(mtk_hal_audio, service_nvram_init_prop)
+get_prop(mtk_hal_audio, vendor_mtk_service_nvram_init_prop)
diff --git a/sepolicy/vendor/mtk_hal_camera.te b/sepolicy/vendor/mtk_hal_camera.te
deleted file mode 100644
index 0556d91bda886474817297a8d90b06670339c491..0000000000000000000000000000000000000000
--- a/sepolicy/vendor/mtk_hal_camera.te
+++ /dev/null
@@ -1 +0,0 @@
-allow mtk_hal_camera vendor_debug_prop:property_service set;
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
new file mode 100644
index 0000000000000000000000000000000000000000..35794ca387fac546d3ed9f913ac5da72fc5fb1a7
--- /dev/null
+++ b/sepolicy/vendor/property.te
@@ -0,0 +1 @@
+system_public_prop(vendor_fm_prop)
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
new file mode 100644
index 0000000000000000000000000000000000000000..e0359adcbc416ab05c07de8d576582517e6ed063
--- /dev/null
+++ b/sepolicy/vendor/property_contexts
@@ -0,0 +1,3 @@
+persist.vendor.connsys.fm_chipid u:object_r:vendor_fm_prop:s0
+persist.vendor.connsys.fm_50khz_support u:object_r:vendor_fm_prop:s0
+persist.vendor.connsys.fm_short_antenna_support u:object_r:vendor_fm_prop:s0
diff --git a/sepolicy/vendor/radio.te b/sepolicy/vendor/radio.te
index 3580a9b4ceb9771be63069cfb02ae8f1c1458bfb..8e7e8de4798dd1308e3107041c56391e8173b4c2 100644
--- a/sepolicy/vendor/radio.te
+++ b/sepolicy/vendor/radio.te
@@ -1 +1 @@
-get_prop(radio, mtk_default_prop)
+get_prop(radio, vendor_mtk_default_prop)
diff --git a/sepolicy/vendor/rild.te b/sepolicy/vendor/rild.te
index 8e6e772a6982fc3aa3d5fb378accaa311a157027..8d337e5245490c36dae5a726d4e965eba5da2883 100644
--- a/sepolicy/vendor/rild.te
+++ b/sepolicy/vendor/rild.te
@@ -1 +1 @@
-get_prop(rild, mtk_simswitch_emmode_prop)
+get_prop(rild, vendor_mtk_simswitch_emmode_prop)
diff --git a/sepolicy/vendor/system_app.te b/sepolicy/vendor/system_app.te
index cb648baf78badbaf3a5b7af3625bd9feb43b36dd..5b89b1b64d432360375b7c606f39b0994c208e13 100644
--- a/sepolicy/vendor/system_app.te
+++ b/sepolicy/vendor/system_app.te
@@ -1,2 +1,3 @@
 allow system_app sysfs_zram:dir search;
 allow system_app sysfs_zram:file r_file_perms;
+get_prop(system_app, vendor_fm_prop)
diff --git a/sepolicy/vendor/thermal.te b/sepolicy/vendor/thermal.te
index 7c3770ecaa824e4e3f91d7e68e47560caf2e02a9..20def67b22ba18179af94d42bc6617961f98b3d4 100644
--- a/sepolicy/vendor/thermal.te
+++ b/sepolicy/vendor/thermal.te
@@ -1 +1 @@
-get_prop(thermal, tel_switch_prop)
+get_prop(thermal, vendor_mtk_tel_switch_prop)