diff --git a/bluetooth.te b/bluetooth.te
index 863cbd8777c2e2f6a05a98d371d2380b6cd7ecb7..4f1ef6e55a9590e1afcb72f8e4976b471b28a273 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -60,7 +60,6 @@ allow bluetooth system_api_service:service_manager find;
 service_manager_local_audit_domain(bluetooth)
 auditallow bluetooth {
     tmp_system_server_service
-    -media_session_service
     -network_management_service
     -power_service
     -registry_service
diff --git a/platform_app.te b/platform_app.te
index 3676c5d3f4dd6284161010a45f59c2e17eb7bbb0..89b3a6625049475c27d97ee00c59f05f23d7d7f9 100644
--- a/platform_app.te
+++ b/platform_app.te
@@ -39,13 +39,6 @@ allow platform_app system_api_service:service_manager find;
 service_manager_local_audit_domain(platform_app)
 auditallow platform_app {
     tmp_system_server_service
-    -lock_settings_service
-    -media_projection_service
-    -media_router_service
-    -media_session_service
-    -mount_service
-    -netpolicy_service
-    -netstats_service
     -network_management_service
     -notification_service
     -power_service
diff --git a/radio.te b/radio.te
index f71d02fde694976aea37edfb0ba3847f9b0931a7..c14e964d6a11f229b07e900b7a1a74fbb6de976b 100644
--- a/radio.te
+++ b/radio.te
@@ -41,7 +41,6 @@ allow radio system_api_service:service_manager find;
 service_manager_local_audit_domain(radio)
 auditallow radio {
     tmp_system_server_service
-    -netstats_service
     -network_management_service
     -notification_service
     -power_service
diff --git a/service.te b/service.te
index 451c9d08016a1cf5d35e74ab0a1ed9562a5d0ad7..bbca5e7bf712db69fdf64302a8848cdd77a66ea1 100644
--- a/service.te
+++ b/service.te
@@ -50,18 +50,18 @@ type hdmi_control_service, system_api_service, system_server_service, service_ma
 type input_method_service, app_api_service, system_server_service, service_manager_type;
 type input_service, app_api_service, system_server_service, service_manager_type;
 type imms_service, app_api_service, system_server_service, service_manager_type;
-type jobscheduler_service, tmp_system_server_service, service_manager_type;
-type launcherapps_service, tmp_system_server_service, service_manager_type;
-type location_service, tmp_system_server_service, service_manager_type;
-type lock_settings_service, tmp_system_server_service, service_manager_type;
-type media_projection_service, tmp_system_server_service, service_manager_type;
-type media_router_service, tmp_system_server_service, service_manager_type;
-type media_session_service, tmp_system_server_service, service_manager_type;
+type jobscheduler_service, app_api_service, system_server_service, service_manager_type;
+type launcherapps_service, app_api_service, system_server_service, service_manager_type;
+type location_service, app_api_service, system_server_service, service_manager_type;
+type lock_settings_service, system_api_service, system_server_service, service_manager_type;
+type media_projection_service, app_api_service, system_server_service, service_manager_type;
+type media_router_service, app_api_service, system_server_service, service_manager_type;
+type media_session_service, app_api_service, system_server_service, service_manager_type;
 type meminfo_service, system_api_service, system_server_service, service_manager_type;
 type midi_service, app_api_service, system_server_service, service_manager_type;
-type mount_service, tmp_system_server_service, service_manager_type;
-type netpolicy_service, tmp_system_server_service, service_manager_type;
-type netstats_service, tmp_system_server_service, service_manager_type;
+type mount_service, app_api_service, system_server_service, service_manager_type;
+type netpolicy_service, app_api_service, system_server_service, service_manager_type;
+type netstats_service, system_api_service, system_server_service, service_manager_type;
 type network_management_service, tmp_system_server_service, service_manager_type;
 type network_score_service, tmp_system_server_service, service_manager_type;
 type notification_service, tmp_system_server_service, service_manager_type;
diff --git a/system_app.te b/system_app.te
index 7d934d12a99daf9f563e3f6e1dcfba2c9cda5473..d518e119488133eff61072a5de30454dbb94d68c 100644
--- a/system_app.te
+++ b/system_app.te
@@ -60,10 +60,6 @@ allow system_app system_api_service:service_manager find;
 service_manager_local_audit_domain(system_app)
 auditallow system_app {
     tmp_system_server_service
-    -lock_settings_service
-    -media_session_service
-    -mount_service
-    -netstats_service
     -network_management_service
     -network_score_service
     -notification_service
diff --git a/system_server.te b/system_server.te
index 80e06e834216a0b7254d907256eda7d849f17c2d..895bd44648d24a43a895b845f3604b3af7bba881 100644
--- a/system_server.te
+++ b/system_server.te
@@ -372,13 +372,6 @@ allow system_server tmp_system_server_service:service_manager { add find };
 service_manager_local_audit_domain(system_server)
 auditallow system_server {
     tmp_system_server_service
-    -jobscheduler_service
-    -location_service
-    -lock_settings_service
-    -media_router_service
-    -media_session_service
-    -mount_service
-    -netpolicy_service
     -network_management_service
     -network_score_service
     -notification_service
diff --git a/untrusted_app.te b/untrusted_app.te
index a51c6eaafea8b557cda3a5db4dbc17f2ba35bc51..c1135e86be610076d8fc8790cd1bfac20d55e558 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -90,17 +90,6 @@ allow untrusted_app system_api_service:service_manager find;
 service_manager_local_audit_domain(untrusted_app)
 auditallow untrusted_app {
     tmp_system_server_service
-    -healthd_service
-    -jobscheduler_service
-    -launcherapps_service
-    -location_service
-    -lock_settings_service
-    -media_router_service
-    -media_session_service
-    -meminfo_service
-    -mount_service
-    -netpolicy_service
-    -netstats_service
     -network_management_service
     -network_score_service
     -notification_service