diff --git a/private/genfs_contexts b/private/genfs_contexts
index 07c31abb61e8d0f43bbe72544ffd8cce179f291b..3914cec7d03874d625d69d837f38ddc9370bbfd0 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -68,12 +68,8 @@ genfscon debugfs /mmc0                                u:object_r:debugfs_mmc:s0
 genfscon debugfs /tracing                             u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/instances                   u:object_r:debugfs_tracing_instances:s0
 genfscon tracefs /instances                           u:object_r:debugfs_tracing_instances:s0
-genfscon debugfs /tracing/instances/wifi/free_buffer  u:object_r:debugfs_wifi_tracing:s0
-genfscon debugfs /tracing/instances/wifi/trace        u:object_r:debugfs_wifi_tracing:s0
-genfscon debugfs /tracing/instances/wifi/tracing_on   u:object_r:debugfs_wifi_tracing:s0
-genfscon tracefs /instances/wifi/free_buffer          u:object_r:debugfs_wifi_tracing:s0
-genfscon tracefs /instances/wifi/trace                u:object_r:debugfs_wifi_tracing:s0
-genfscon tracefs /instances/wifi/tracing_on           u:object_r:debugfs_wifi_tracing:s0
+genfscon debugfs /tracing/instances/wifi              u:object_r:debugfs_wifi_tracing:s0
+genfscon tracefs /instances/wifi                      u:object_r:debugfs_wifi_tracing:s0
 genfscon debugfs /tracing/trace_marker                u:object_r:debugfs_trace_marker:s0
 genfscon tracefs /trace_marker                        u:object_r:debugfs_trace_marker:s0
 
diff --git a/private/system_server.te b/private/system_server.te
index e06fe4cca23bf3fd587738ec8c8f9c68229b453f..f99deb7c6c8db73463cfd24d9f2f3766065c88c7 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -679,6 +679,7 @@ allow system_server sysfs_leds:dir r_dir_perms;
 
 # Allow WifiService to start, stop, and read wifi-specific trace events.
 allow system_server debugfs_tracing_instances:dir search;
+allow system_server debugfs_wifi_tracing:dir search;
 allow system_server debugfs_wifi_tracing:file rw_file_perms;
 
 # allow system_server to exec shell, asanwrapper & zygote(app_process) on ASAN builds. Needed to run