diff --git a/tracking_denials/hal_fingerprint_default.te b/tracking_denials/hal_fingerprint_default.te
index 3939b28a..9a2d37e5 100644
--- a/tracking_denials/hal_fingerprint_default.te
+++ b/tracking_denials/hal_fingerprint_default.te
@@ -1,5 +1,3 @@
-#b/220263520
-dontaudit hal_fingerprint_default vendor_default_prop:property_service set;
 # b/183338543
 dontaudit hal_fingerprint_default system_data_root_file:file { read };
 dontaudit hal_fingerprint_default default_prop:file { getattr };
diff --git a/whitechapel/vendor/google/hal_fingerprint_default.te b/whitechapel/vendor/google/hal_fingerprint_default.te
index 6dedfce8..b2378682 100644
--- a/whitechapel/vendor/google/hal_fingerprint_default.te
+++ b/whitechapel/vendor/google/hal_fingerprint_default.te
@@ -8,9 +8,7 @@ allow hal_fingerprint_default sysfs_fingerprint:dir r_dir_perms;
 allow hal_fingerprint_default sysfs_fingerprint:file rw_file_perms;
 allow hal_fingerprint_default fwk_stats_service:service_manager find;
 get_prop(hal_fingerprint_default, fingerprint_ghbm_prop)
-userdebug_or_eng(`
-  get_prop(hal_fingerprint_default, vendor_fingerprint_fake_prop)
-')
+set_prop(hal_fingerprint_default, vendor_fingerprint_prop)
 add_hwservice(hal_fingerprint_default, hal_fingerprint_ext_hwservice)
 
 # allow fingerprint to access power hal
diff --git a/whitechapel/vendor/google/property.te b/whitechapel/vendor/google/property.te
index bb0894fc..e98973f2 100644
--- a/whitechapel/vendor/google/property.te
+++ b/whitechapel/vendor/google/property.te
@@ -48,7 +48,7 @@ vendor_internal_prop(vendor_touchpanel_prop)
 vendor_internal_prop(vendor_tcpdump_log_prop)
 
 # Fingerprint
-vendor_internal_prop(vendor_fingerprint_fake_prop)
+vendor_internal_prop(vendor_fingerprint_prop)
 
 # Dynamic sensor
 vendor_internal_prop(vendor_dynamic_sensor_prop)
diff --git a/whitechapel/vendor/google/property_contexts b/whitechapel/vendor/google/property_contexts
index 149a91be..cdbe1bc4 100644
--- a/whitechapel/vendor/google/property_contexts
+++ b/whitechapel/vendor/google/property_contexts
@@ -105,7 +105,8 @@ vendor.tcpdump.log.alwayson                     u:object_r:vendor_tcpdump_log_pr
 vendor.tcpdump.output.dir                       u:object_r:vendor_tcpdump_log_prop:s0
 
 # Fingerprint
-vendor.fingerprint.disable.fake                 u:object_r:vendor_fingerprint_fake_prop:s0
+vendor.fingerprint.                             u:object_r:vendor_fingerprint_prop:s0
+vendor.gf.                                      u:object_r:vendor_fingerprint_prop:s0
 
 # Dynamic sensor
 vendor.dynamic_sensor.                          u:object_r:vendor_dynamic_sensor_prop:s0
diff --git a/whitechapel/vendor/google/vendor_init.te b/whitechapel/vendor/google/vendor_init.te
index f8731c04..dfd8e996 100644
--- a/whitechapel/vendor/google/vendor_init.te
+++ b/whitechapel/vendor/google/vendor_init.te
@@ -34,6 +34,4 @@ get_prop(vendor_init, vendor_battery_profile_prop)
 set_prop(vendor_init, vendor_battery_defender_prop)
 
 # Fingerprint property
-userdebug_or_eng(`
-  set_prop(vendor_init, vendor_fingerprint_fake_prop)
-')
+set_prop(vendor_init, vendor_fingerprint_prop)