diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1e06cf8..860cc00 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -219,8 +219,7 @@ DEVICE_MANIFEST_FILE := \
     $(COMMON_PATH)/vintf/manifest_nfc.xml
 
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
-    $(COMMON_PATH)/vintf/framework_compatibility_matrix.xml \
-    vendor/lineage/config/device_framework_matrix.xml
+    $(COMMON_PATH)/vintf/framework_compatibility_matrix.xml
 
 # WiFi
 BOARD_WLAN_DEVICE := qcwcn
diff --git a/vintf/framework_compatibility_matrix.xml b/vintf/framework_compatibility_matrix.xml
index 3f283ef..de4f9a8 100644
--- a/vintf/framework_compatibility_matrix.xml
+++ b/vintf/framework_compatibility_matrix.xml
@@ -1095,4 +1095,21 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <!-- Health -->
+    <hal format="aidl" optional="true">
+        <name>vendor.lineage.health</name>
+        <interface>
+            <name>IChargingControl</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <!-- Trust -->
+    <hal format="hidl" optional="true">
+        <name>vendor.lineage.trust</name>
+        <version>1.0</version>
+        <interface>
+            <name>IUsbRestrict</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </compatibility-matrix>