diff --git a/init.common.diag.rc.userdebug b/init.common.diag.rc.userdebug
index e28af9b7a..e1702a170 100644
--- a/init.common.diag.rc.userdebug
+++ b/init.common.diag.rc.userdebug
@@ -122,10 +122,10 @@ service vendor.cnss_diag_txt /vendor/bin/cnss_diag -s -f -m /data/vendor/wifi/cn
     disabled
     oneshot
 
-on property:persist.sys.crash_rcu=true
+on property:persist.vendor.sys.crash_rcu=true
     write /proc/sys/kernel/panic_on_rcu_stall 1
 
-on property:persist.sys.crash_rcu=false
+on property:persist.vendor.sys.crash_rcu=false
     write /proc/sys/kernel/panic_on_rcu_stall 0
 
 
diff --git a/sepolicy/property.te b/sepolicy/property.te
index 028c18fa4..936d0bac7 100644
--- a/sepolicy/property.te
+++ b/sepolicy/property.te
@@ -6,7 +6,7 @@ type mid_prop, property_type;
 type ssr_prop, property_type;
 type cnss_diag_prop, property_type;
 type thermal_prop, property_type;
-type ramdump_prop, property_type;
+type vendor_ramdump_prop, property_type;
 type sys_time_prop, property_type;
 type post_boot_prop, property_type;
 type bluetooth_log_prop, property_type;
diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
index 05177999e..65ad1cbf5 100644
--- a/sepolicy/property_contexts
+++ b/sepolicy/property_contexts
@@ -9,7 +9,8 @@ ro.boot.hardware.sku                u:object_r:hw_sku_prop:s0
 ro.boot.mid                         u:object_r:mid_prop:s0
 debug.ssrdump                       u:object_r:ssr_prop:s0
 persist.sys.cnss.                   u:object_r:cnss_diag_prop:s0
-persist.sys.crash_rcu               u:object_r:ramdump_prop:s0
+vendor.debug.ramdump.               u:object_r:vendor_ramdump_prop:s0
+persist.vendor.sys.crash_rcu        u:object_r:vendor_ramdump_prop:s0
 sys.qcom.thermalcfg                 u:object_r:thermal_prop:s0
 ctl.vendor.thermal-engine           u:object_r:thermal_prop:s0
 sys.time.set                        u:object_r:sys_time_prop:s0
diff --git a/sepolicy/ramdump_app.te b/sepolicy/ramdump_app.te
index c76eaca55..ecb5d8343 100644
--- a/sepolicy/ramdump_app.te
+++ b/sepolicy/ramdump_app.te
@@ -9,5 +9,5 @@ userdebug_or_eng(`
   allow ramdump_app ramdump_vendor_data_file:file create_file_perms;
   allow ramdump_app ramdump_vendor_data_file:dir create_dir_perms;
 
-  set_prop(ramdump_app, ramdump_prop);
+  set_prop(ramdump_app, vendor_ramdump_prop);
 ')