diff --git a/gps/file_contexts b/gps/file_contexts
index cb6f452a..cce530c7 100644
--- a/gps/file_contexts
+++ b/gps/file_contexts
@@ -1,10 +1,11 @@
 # gnss/gps data/log files
-/data/vendor/gps(/.*)?       u:object_r:vendor_gps_file:s0
+/data/vendor/gps(/.*)?                                            u:object_r:vendor_gps_file:s0
 
 # devices
-/dev/bbd_control             u:object_r:vendor_gnss_device:s0
-/dev/ttyBCM                  u:object_r:vendor_gnss_device:s0
+/dev/bbd_control                                                  u:object_r:vendor_gnss_device:s0
+/dev/ttyBCM                                                       u:object_r:vendor_gnss_device:s0
 
 # vendor binaries
-/vendor/bin/hw/scd           u:object_r:scd_exec:s0
-/vendor/bin/hw/lhd           u:object_r:lhd_exec:s0
+/vendor/bin/hw/scd                                                u:object_r:scd_exec:s0
+/vendor/bin/hw/lhd                                                u:object_r:lhd_exec:s0
+/vendor/bin/hw/android\.hardware\.gnss@[0-9]\.[0-9]-service-brcm  u:object_r:hal_gnss_default_exec:s0
diff --git a/legacy/hal_gnss_default.te b/gps/hal_gnss_default.te
similarity index 100%
rename from legacy/hal_gnss_default.te
rename to gps/hal_gnss_default.te
diff --git a/legacy/file_contexts b/legacy/file_contexts
index aaec82de..4d956aa7 100644
--- a/legacy/file_contexts
+++ b/legacy/file_contexts
@@ -23,9 +23,6 @@
 # HALs
 #
 /(vendor|system/vendor)/bin/hw/android\.hardware\.boot@1\.[0-2]-service-gs201                   u:object_r:hal_bootctl_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.gnss@1\.1-service-brcm                        u:object_r:hal_gnss_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.gnss@2\.0-service-brcm                        u:object_r:hal_gnss_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.gnss@[0-9]\.[0-9]-service-brcm                u:object_r:hal_gnss_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.dumpstate@1\.1-service\.gs201                 u:object_r:hal_dumpstate_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.power\.stats@1\.0-service\.gs201              u:object_r:hal_power_stats_default_exec:s0
 # Wireless charger HAL