diff --git a/legacy/hbmsvmanager_app.te b/legacy/hbmsvmanager_app.te
deleted file mode 100644
index 534f6c82..00000000
--- a/legacy/hbmsvmanager_app.te
+++ /dev/null
@@ -1,11 +0,0 @@
-type hbmsvmanager_app, domain, coredomain;
-
-app_domain(hbmsvmanager_app);
-
-allow hbmsvmanager_app hal_pixel_display_service:service_manager find;
-binder_call(hbmsvmanager_app, hal_graphics_composer_default)
-
-# Standard system services
-allow hbmsvmanager_app app_api_service:service_manager find;
-
-allow hbmsvmanager_app cameraserver_service:service_manager find;
diff --git a/legacy/seapp_contexts b/legacy/seapp_contexts
index 90b10346..cf72b1a8 100644
--- a/legacy/seapp_contexts
+++ b/legacy/seapp_contexts
@@ -1,9 +1,6 @@
 # coredump/ramdump
 user=_app seinfo=platform name=com.android.ramdump domain=ramdump_app type=app_data_file levelFrom=all
 
-# HbmSVManager
-user=_app seinfo=platform name=com.android.hbmsvmanager domain=hbmsvmanager_app type=app_data_file levelFrom=all
-
 # Hardware Info Collection
 user=_app isPrivApp=true name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
 
diff --git a/legacy/service.te b/legacy/service.te
index 357dffe4..87dec4c0 100644
--- a/legacy/service.te
+++ b/legacy/service.te
@@ -1,4 +1,3 @@
-type hal_pixel_display_service, service_manager_type, vendor_service;
 type uwb_vendor_service, service_manager_type, vendor_service;
 type touch_context_service, service_manager_type, vendor_service;
 type hal_uwb_vendor_service, service_manager_type, vendor_service;
diff --git a/legacy/service_contexts b/legacy/service_contexts
index 6fb9de1f..6431f24d 100644
--- a/legacy/service_contexts
+++ b/legacy/service_contexts
@@ -1,4 +1,3 @@
-com.google.hardware.pixel.display.IDisplay/default         u:object_r:hal_pixel_display_service:s0
 com.google.input.ITouchContextService/default              u:object_r:touch_context_service:s0
 uwb_vendor                                                 u:object_r:uwb_vendor_service:s0
 hardware.qorvo.uwb.IUwb/default                            u:object_r:hal_uwb_vendor_service:s0
diff --git a/whitechapel_pro/hbmsvmanager_app.te b/whitechapel_pro/hbmsvmanager_app.te
new file mode 100644
index 00000000..06bfed6c
--- /dev/null
+++ b/whitechapel_pro/hbmsvmanager_app.te
@@ -0,0 +1,3 @@
+type hbmsvmanager_app, domain;
+app_domain(hbmsvmanager_app);
+allow hbmsvmanager_app app_api_service:service_manager find;
diff --git a/whitechapel_pro/seapp_contexts b/whitechapel_pro/seapp_contexts
index 23acc183..68701fe1 100644
--- a/whitechapel_pro/seapp_contexts
+++ b/whitechapel_pro/seapp_contexts
@@ -11,6 +11,9 @@ user=_app isPrivApp=true  seinfo=platform name=com.thales.device.ofl.app.basicag
 # Domain for omadm
 user=_app isPrivApp=true seinfo=platform name=com.android.omadm.service domain=omadm_app type=app_data_file levelFrom=all
 
+# HbmSVManager
+user=_app seinfo=platform name=com.android.hbmsvmanager domain=hbmsvmanager_app type=app_data_file levelFrom=all
+
 # grilservice
 user=_app isPrivApp=true name=com.google.android.grilservice domain=grilservice_app levelFrom=all