diff --git a/sepolicy/bluetooth/hal_bluetooth_default.te b/sepolicy/bluetooth/hal_bluetooth_default.te
index d78de58..98c8048 100644
--- a/sepolicy/bluetooth/hal_bluetooth_default.te
+++ b/sepolicy/bluetooth/hal_bluetooth_default.te
@@ -1,3 +1,5 @@
+# Bluetooth hal
+
 allow hal_bluetooth_default bt_device:chr_file rw_file_perms;
 
 add_hwservice(hal_bluetooth_default, hal_bluetooth_coexistence_hwservice)
@@ -10,3 +12,6 @@ userdebug_or_eng(`
   allow hal_bluetooth_default sscoredump_vendor_data_coredump_file:file create_file_perms;
   set_prop(hal_bluetooth_default, vendor_ssrdump_prop)
 ')
+
+set_prop(hal_bluetooth_default, vendor_bluetooth_prop)
+set_prop(vendor_init, vendor_bluetooth_prop)
diff --git a/sepolicy/tracking_denials/bug_map b/sepolicy/tracking_denials/bug_map
index 2e6daa3..e6f51f3 100644
--- a/sepolicy/tracking_denials/bug_map
+++ b/sepolicy/tracking_denials/bug_map
@@ -1,2 +1,8 @@
-kernel vendor_charger_debugfs dir b/305600791
+dump_modem sscoredump_vendor_data_coredump_file dir b/361725767
+dump_modem sscoredump_vendor_data_logcat_file dir b/361725767
 hal_bluetooth_default vendor_data_file dir b/318453067
+hal_bluetooth_default vendor_default_prop property_service b/359428216
+hal_vibrator_default default_android_service service_manager b/361726059
+kernel vendor_charger_debugfs dir b/305600791
+vendor_init default_prop property_service b/359428217
+vendor_init default_prop property_service b/359428463
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
new file mode 100644
index 0000000..60d7f0a
--- /dev/null
+++ b/sepolicy/vendor/property_contexts
@@ -0,0 +1 @@
+persist.vendor.service.bdroid. u:object_r:vendor_bluetooth_prop:s0