diff --git a/confirmationui/device.te b/confirmationui/device.te
new file mode 100644
index 00000000..54fe349f
--- /dev/null
+++ b/confirmationui/device.te
@@ -0,0 +1 @@
+type tui_device, dev_type;
diff --git a/confirmationui/file_contexts b/confirmationui/file_contexts
new file mode 100644
index 00000000..49db4171
--- /dev/null
+++ b/confirmationui/file_contexts
@@ -0,0 +1,4 @@
+/vendor/bin/securedpud\.slider                                                   u:object_r:securedpud_slider_exec:s0
+/vendor/bin/hw/android\.hardware\.confirmationui@1\.0-service\.trusty\.vendor    u:object_r:hal_confirmationui_default_exec:s0
+
+/dev/tui-driver                                                                  u:object_r:tui_device:s0
diff --git a/whitechapel/vendor/google/hal_confirmationui.te b/confirmationui/hal_confirmationui.te
similarity index 100%
rename from whitechapel/vendor/google/hal_confirmationui.te
rename to confirmationui/hal_confirmationui.te
diff --git a/whitechapel/vendor/google/securedpud.slider.te b/confirmationui/securedpud.slider.te
similarity index 100%
rename from whitechapel/vendor/google/securedpud.slider.te
rename to confirmationui/securedpud.slider.te
diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te
index 68a73c6f..f0e8d8d0 100644
--- a/whitechapel/vendor/google/device.te
+++ b/whitechapel/vendor/google/device.te
@@ -16,7 +16,6 @@ type pktrouter_device, dev_type;
 type vendor_toe_device, dev_type;
 type custom_ab_block_device, dev_type;
 type devinfo_block_device, dev_type;
-type tui_device, dev_type;
 
 # usbpd
 type logbuffer_device, dev_type;
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index 7773f31c..4b8ac2dd 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -94,7 +94,6 @@
 /dev/repeater                  u:object_r:video_device:s0
 /dev/scsc_h4_0                 u:object_r:radio_device:s0
 /dev/umts_boot0                u:object_r:radio_device:s0
-/dev/tui-driver                u:object_r:tui_device:s0
 /dev/logbuffer_tcpm            u:object_r:logbuffer_device:s0
 /dev/logbuffer_usbpd           u:object_r:logbuffer_device:s0
 /dev/logbuffer_ssoc            u:object_r:logbuffer_device:s0
@@ -325,13 +324,11 @@
 
 
 # Trusty
-/vendor/bin/securedpud.slider        u:object_r:securedpud_slider_exec:s0
 /vendor/bin/storageproxyd            u:object_r:tee_exec:s0
 /vendor/bin/trusty_apploader         u:object_r:trusty_apploader_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\.keymaster@4\.0-service\.trusty                 u:object_r:hal_keymaster_default_exec:s0
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty              u:object_r:hal_keymint_default_exec:s0
-/vendor/bin/hw/android\.hardware\.confirmationui@1\.0-service\.trusty\.vendor    u:object_r:hal_confirmationui_default_exec:s0
 /dev/trusty-ipc-dev0                 u:object_r:tee_device:s0
 /data/vendor/ss(/.*)?                u:object_r:tee_data_file:s0
 /mnt/vendor/persist/ss(/.*)?         u:object_r:persist_ss_file:s0