diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2658e3f..e2695ab 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -112,7 +112,7 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
 
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
-    $(COMMON_PATH)/device_framework_matrix.xml \
+    hardware/motorola/vintf/device_framework_matrix.xml \
     hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
     vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
deleted file mode 100644
index d48122a..0000000
--- a/device_framework_matrix.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<compatibility-matrix version="2.0" type="framework">
-    <hal format="hidl" optional="true">
-        <name>com.motorola.hardware.biometric.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMotoFingerPrint</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IMotoFingerPrintSensorTest</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>com.motorola.hardware.display.panel</name>
-        <version>1.0-1</version>
-        <interface>
-            <name>IDisplayPanel</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>com.motorola.hardware.display.touch</name>
-        <transport>hwbinder</transport>
-        <version>1.0-1</version>
-        <interface>
-            <name>IMotTouch</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.camera.desktop</name>
-        <version>1.0</version>
-        <version>2.0</version>
-        <interface>
-            <name>ICameraDesktop</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.camera.imgtuner</name>
-        <version>1.0</version>
-        <interface>
-            <name>IImageTuning</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.fdrcontrol</name>
-        <version>1.0-2</version>
-        <interface>
-            <name>IFdrControl</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.fmradio</name>
-        <version>1.0</version>
-        <interface>
-            <name>IMotFMRadio</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>