diff --git a/caiman-sepolicy.mk b/caiman-sepolicy.mk
index d34e613a3206d727a64c0ae8fbd3b0e97565f27e..7a855876916e568e9633efd1e1910a2a3684b18c 100644
--- a/caiman-sepolicy.mk
+++ b/caiman-sepolicy.mk
@@ -1,11 +1,5 @@
 # sepolicy that are shared among devices using ZumaPro
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/caiman
 
-# UDFPS sepolicy.
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint
-
 # GPS sepolicy
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/gnss
-
-#Fingerprint
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint_capacitance
diff --git a/fingerprint_capacitance/system_app.te b/caiman/system_app.te
similarity index 100%
rename from fingerprint_capacitance/system_app.te
rename to caiman/system_app.te
diff --git a/komodo-sepolicy.mk b/komodo-sepolicy.mk
index feed173ce6319577667f7f9a658e69b4fafa36b6..df5cf99754f2076e766812ef01f7e3f8182f4fcb 100644
--- a/komodo-sepolicy.mk
+++ b/komodo-sepolicy.mk
@@ -1,11 +1,5 @@
 # sepolicy that are shared among devices using ZumaPro
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/komodo
 
-# UDFPS sepolicy.
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint
-
 # GPS sepolicy
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/gnss
-
-#Fingerprint
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint_capacitance
diff --git a/komodo/system_app.te b/komodo/system_app.te
new file mode 100644
index 0000000000000000000000000000000000000000..e1a7d5236dc7c68926bb0e43bdbd1da37674b928
--- /dev/null
+++ b/komodo/system_app.te
@@ -0,0 +1,2 @@
+# TODO (b/306087355) Remove this and make it specific to the app
+hal_client_domain(system_app, hal_fingerprint)
diff --git a/ripcurrent24-sepolicy.mk b/ripcurrent24-sepolicy.mk
index 48f50099a36b50a56ca66bfcf2db3c78cc60243b..a95f1cd4df3e81cbbc658e254dc21e9d22cd53ad 100644
--- a/ripcurrent24-sepolicy.mk
+++ b/ripcurrent24-sepolicy.mk
@@ -1,11 +1,5 @@
 # sepolicy that are shared among devices using ZumaPro
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/ripcurrent24
 
-# UDFPS sepolicy.
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint
-
 # GPS sepolicy
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/gnss
-
-#Fingerprint
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint_capacitance
diff --git a/ripcurrent24/system_app.te b/ripcurrent24/system_app.te
new file mode 100644
index 0000000000000000000000000000000000000000..e1a7d5236dc7c68926bb0e43bdbd1da37674b928
--- /dev/null
+++ b/ripcurrent24/system_app.te
@@ -0,0 +1,2 @@
+# TODO (b/306087355) Remove this and make it specific to the app
+hal_client_domain(system_app, hal_fingerprint)
diff --git a/ripcurrentpro-sepolicy.mk b/ripcurrentpro-sepolicy.mk
index 0bcab522c7ccd5a51a7850fa182534423ff29c64..88167b20ee3daa373236fcdee74fb7a451beb26d 100644
--- a/ripcurrentpro-sepolicy.mk
+++ b/ripcurrentpro-sepolicy.mk
@@ -1,5 +1,3 @@
 # sepolicy that are shared among devices using ZumaPro
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/ripcurrentpro
 
-# UDFPS sepolicy.
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint
diff --git a/ripcurrentpro/system_app.te b/ripcurrentpro/system_app.te
new file mode 100644
index 0000000000000000000000000000000000000000..e1a7d5236dc7c68926bb0e43bdbd1da37674b928
--- /dev/null
+++ b/ripcurrentpro/system_app.te
@@ -0,0 +1,2 @@
+# TODO (b/306087355) Remove this and make it specific to the app
+hal_client_domain(system_app, hal_fingerprint)
diff --git a/tokay-sepolicy.mk b/tokay-sepolicy.mk
index bfc19e5cd983b21d09504dd96c72479ff5269e92..c19f6f719c916c1092e7d9e388f811968dfd78d8 100644
--- a/tokay-sepolicy.mk
+++ b/tokay-sepolicy.mk
@@ -1,11 +1,5 @@
 # sepolicy that are shared among devices using ZumaPro
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/tokay
 
-# UDFPS sepolicy.
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint
-
 # GPS sepolicy
 BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/gnss
-
-#Fingerprint
-BOARD_SEPOLICY_DIRS += device/google/caimito-sepolicy/fingerprint_capacitance
diff --git a/tokay/system_app.te b/tokay/system_app.te
new file mode 100644
index 0000000000000000000000000000000000000000..e1a7d5236dc7c68926bb0e43bdbd1da37674b928
--- /dev/null
+++ b/tokay/system_app.te
@@ -0,0 +1,2 @@
+# TODO (b/306087355) Remove this and make it specific to the app
+hal_client_domain(system_app, hal_fingerprint)