diff --git a/BoardConfig.mk b/BoardConfig.mk
index d48869ed..0376cb39 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -136,3 +136,6 @@ TARGET_USES_COLOR_METADATA := true
 
 # Charger Mode
 BOARD_CHARGER_ENABLE_SUSPEND := true
+
+# Vendor Interface Manifest
+DEVICE_MANIFEST_FILE := device/google/wahoo/manifest.xml
diff --git a/device.mk b/device.mk
index 5ac198a6..1d05287f 100644
--- a/device.mk
+++ b/device.mk
@@ -76,10 +76,6 @@ endif
 MSM_VIDC_TARGET_LIST := msm8998 # Get the color format from kernel headers
 MASTER_SIDE_CP_TARGET_LIST := msm8998 # ION specific settings
 
-# Vendor Interface Manifest
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
-
 # A/B support
 PRODUCT_PACKAGES += \
     otapreopt_script \