diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts
index 21451224..a694d515 100644
--- a/legacy/whitechapel_pro/file_contexts
+++ b/legacy/whitechapel_pro/file_contexts
@@ -2,7 +2,6 @@
 /vendor/bin/dumpsys                                                         u:object_r:vendor_dumpsys:s0
 /vendor/bin/hw/android\.hardware\.gatekeeper-service\.trusty                u:object_r:hal_gatekeeper_default_exec:s0
 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.trusty           u:object_r:hal_gatekeeper_default_exec:s0
-/vendor/bin/hw/android\.hardware\.contexthub-service\.generic               u:object_r:hal_contexthub_default_exec:s0
 /vendor/bin/hw/android\.hardware\.nfc-service\.st                           u:object_r:hal_nfc_default_exec:s0
 
 # Vendor libraries
diff --git a/tracking_denials/chre.te b/tracking_denials/chre.te
deleted file mode 100644
index beee716f..00000000
--- a/tracking_denials/chre.te
+++ /dev/null
@@ -1,4 +0,0 @@
-# b/261105224
-dontaudit chre hal_system_suspend_service:service_manager { find };
-dontaudit chre servicemanager:binder { call };
-dontaudit chre system_suspend_server:binder { call };
diff --git a/tracking_denials/hal_contexthub_default.te b/tracking_denials/hal_contexthub_default.te
deleted file mode 100644
index 3c9a51fb..00000000
--- a/tracking_denials/hal_contexthub_default.te
+++ /dev/null
@@ -1,7 +0,0 @@
-# b/261105182
-dontaudit hal_contexthub_default chre:unix_stream_socket { connectto };
-dontaudit hal_contexthub_default chre_socket:sock_file { write };
-# b/264489794
-userdebug_or_eng(`
-  permissive hal_contexthub_default;
-')
\ No newline at end of file
diff --git a/tracking_denials/system_suspend.te b/tracking_denials/system_suspend.te
deleted file mode 100644
index b834b57b..00000000
--- a/tracking_denials/system_suspend.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/261105356
-dontaudit system_suspend_server chre:binder { transfer };
diff --git a/vendor/file_contexts b/vendor/file_contexts
index 34426d68..b0bf87d0 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -12,6 +12,7 @@
 /vendor/bin/hw/android\.hardware\.secure_element-service.uicc               u:object_r:hal_secure_element_uicc_exec:s0
 /vendor/bin/hw/android\.hardware\.qorvo\.uwb\.service                       u:object_r:hal_uwb_vendor_default_exec:s0
 /vendor/bin/hw/android\.hardware\.composer\.hwc3-service\.pixel             u:object_r:hal_graphics_composer_default_exec:s0
+/vendor/bin/hw/android\.hardware\.contexthub-service\.generic               u:object_r:hal_contexthub_default_exec:s0
 /vendor/bin/hw/google\.hardware\.media\.c2@2\.0-service                     u:object_r:mediacodec_google_exec:s0
 /vendor/bin/dump/dump_wlan\.sh                                              u:object_r:dump_wlan_exec:s0
 /vendor/bin/dump/dump_cma\.sh                                               u:object_r:dump_cma_exec:s0
diff --git a/vendor/hal_contexthub_default.te b/vendor/hal_contexthub_default.te
new file mode 100644
index 00000000..7e0eef2b
--- /dev/null
+++ b/vendor/hal_contexthub_default.te
@@ -0,0 +1,2 @@
+# Allow context hub HAL to communicate with daemon via socket
+unix_socket_connect(hal_contexthub_default, chre, chre)