diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 83c53b6e27..8b3f857fd4 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -245,9 +245,8 @@ PRODUCT_PACKAGES += \
     wifi-service \
     wm \
 
-# VINTF data
+# VINTF data for system image
 PRODUCT_PACKAGES += \
-    device_manifest.xml \
     framework_manifest.xml \
     framework_compatibility_matrix.xml \
 
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 681def22dd..9542a0e230 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \
     android.hardware.cas@1.0-service \
     android.hardware.configstore@1.0-service \
     android.hardware.media.omx@1.0-service \
-    device_compatibility_matrix.xml \
     fs_config_files_nonsystem \
     fs_config_dirs_nonsystem \
     gralloc.default \
@@ -48,3 +47,8 @@ PRODUCT_PACKAGES += \
     shell_and_utilities_vendor \
     vndservice \
     vndservicemanager \
+
+# VINTF data for vendor image
+PRODUCT_PACKAGES += \
+    device_manifest.xml \
+    device_compatibility_matrix.xml \