diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index ed49c99..a82a421 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -103,16 +103,8 @@
     framework_compatibility_matrix.6.xml \
     framework_compatibility_matrix.7.xml \
     framework_compatibility_matrix.8.xml \
-    framework_compatibility_matrix.device.xml \
-
-# Allow only cuttlefish to continue using matrix 9 HALs
-# TODO(b/290060286) This is a temporary workaround for trunk stable and
-# should be removed once interface versions can be flagged properly.
-ifneq (,$(filter device/google/cuttlefish/shared/config/manifest.xml, $(DEVICE_MANIFEST_FILE)))
-my_system_matrix_deps += \
     framework_compatibility_matrix.9.xml \
-
-endif
+    framework_compatibility_matrix.device.xml \
 
 my_framework_matrix_deps += \
     $(my_system_matrix_deps)
diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml
index bb908f3..4aa832b 100644
--- a/compatibility_matrices/compatibility_matrix.8.xml
+++ b/compatibility_matrices/compatibility_matrix.8.xml
@@ -122,7 +122,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true" updatable-via-apex="true">
+    <hal format="aidl" optional="true">
         <name>android.hardware.biometrics.fingerprint</name>
         <version>3</version>
         <interface>