diff --git a/whitechapel/vendor/google/dumpstate.te b/whitechapel/vendor/google/dumpstate.te
index 9b5c0538..7c024e3d 100644
--- a/whitechapel/vendor/google/dumpstate.te
+++ b/whitechapel/vendor/google/dumpstate.te
@@ -2,7 +2,6 @@ dump_hal(hal_telephony)
 dump_hal(hal_graphics_composer)
 
 userdebug_or_eng(`
-  allow dumpstate vendor_dmabuf_debugfs:file r_file_perms;
   allow dumpstate media_rw_data_file:file append;
 ')
 
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index 5868a14a..532bb190 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -23,18 +23,18 @@ type vendor_misc_data_file, file_type, data_file_type;
 type vendor_rpmbmock_data_file, file_type, data_file_type;
 
 # Exynos debugfs
-type vendor_ion_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_dmabuf_debugfs, fs_type, debugfs_type, sysfs_type;
+type vendor_ion_debugfs, fs_type, debugfs_type;
+type vendor_dmabuf_debugfs, fs_type, debugfs_type;
 type vendor_mali_debugfs, fs_type, debugfs_type;
-type vendor_dri_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_pm_genpd_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_regmap_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_usb_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_maxfg_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_charger_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_votable_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_battery_debugfs, fs_type, debugfs_type, sysfs_type;
-type vendor_sjtag_debugfs, fs_type, debugfs_type, sysfs_type;
+type vendor_dri_debugfs, fs_type, debugfs_type;
+type vendor_pm_genpd_debugfs, fs_type, debugfs_type;
+type vendor_regmap_debugfs, fs_type, debugfs_type;
+type vendor_usb_debugfs, fs_type, debugfs_type;
+type vendor_maxfg_debugfs, fs_type, debugfs_type;
+type vendor_charger_debugfs, fs_type, debugfs_type;
+type vendor_votable_debugfs, fs_type, debugfs_type;
+type vendor_battery_debugfs, fs_type, debugfs_type;
+type vendor_sjtag_debugfs, fs_type, debugfs_type;
 
 # Exynos sysfs
 type sysfs_exynos_bts, sysfs_type, fs_type;
diff --git a/whitechapel/vendor/google/hal_dumpstate_default.te b/whitechapel/vendor/google/hal_dumpstate_default.te
index 40643a38..6629fe85 100644
--- a/whitechapel/vendor/google/hal_dumpstate_default.te
+++ b/whitechapel/vendor/google/hal_dumpstate_default.te
@@ -77,8 +77,6 @@ allow hal_dumpstate_default sysfs_chip_id:file r_file_perms;
 allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans;
 allow hal_dumpstate_default vendor_shell_exec:file execute_no_trans;
 
-allow hal_dumpstate_default debugfs_f2fs:dir r_dir_perms;
-allow hal_dumpstate_default debugfs_f2fs:file r_file_perms;
 allow hal_dumpstate_default sysfs_scsi_devices_0000:dir r_dir_perms;
 allow hal_dumpstate_default sysfs_scsi_devices_0000:file r_file_perms;
 
@@ -135,6 +133,9 @@ userdebug_or_eng(`
   allow hal_dumpstate_default sysfs_bcl:lnk_file read;
   allow hal_dumpstate_default tcpdump_vendor_data_file:dir create_dir_perms;
   allow hal_dumpstate_default tcpdump_vendor_data_file:file create_file_perms;
+  allow hal_dumpstate_default debugfs_f2fs:dir r_dir_perms;
+  allow hal_dumpstate_default debugfs_f2fs:file r_file_perms;
+
   set_prop(hal_dumpstate_default, vendor_tcpdump_log_prop)
 ')