diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3ff23db..604dba5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -27,3 +27,6 @@
 
 # Inherit common board flags
 include device/samsung/universal7904-common/BoardConfigCommon.mk
+
+# VINTF
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/configs/android.hardware.keymaster@3.0-service.xml
diff --git a/device.mk b/device.mk
index f4a3deb..156996d 100644
--- a/device.mk
+++ b/device.mk
@@ -11,9 +11,6 @@
     android.hardware.keymaster@3.0-impl \
     libkeymaster3device
 
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/android.hardware.keymaster@3.0-service.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/android.hardware.keymaster@3.0-service.xml
-
 # NFC
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf