diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index 60a6380..472e7ad 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -3,13 +3,13 @@ COMMON_PATH := device/samsung/universal7885-common
 BOARD_VENDOR := samsung
 
 # Platform
-TARGET_BOARD_PLATFORM := exynos7
-
 ifeq ($(TARGET_DEVICE), $(filter $(TARGET_DEVICE),a10 a20 a20e))
 TARGET_SOC := exynos7884B
+TARGET_BOARD_PLATFORM := universal7884B
 TARGET_BOOTLOADER_BOARD_NAME := universal7884B
 else ifeq ($(TARGET_DEVICE), $(filter $(TARGET_DEVICE),a30 a40))
 TARGET_SOC := exynos7904
+TARGET_BOARD_PLATFORM := universal7904
 TARGET_BOOTLOADER_BOARD_NAME := universal7904
 endif
 
diff --git a/universal7885-common/configs/vintf/manifest.mk b/universal7885-common/configs/vintf/manifest.mk
index 9ce912c..a26ec04 100644
--- a/universal7885-common/configs/vintf/manifest.mk
+++ b/universal7885-common/configs/vintf/manifest.mk
@@ -4,3 +4,7 @@ DEVICE_MANIFEST_FILE := $(MANIFEST_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(MANIFEST_PATH)/compatibility_matrix.xml
 ODM_MANIFEST_SKUS += NFC
 ODM_MANIFEST_NFC_FILES := $(MANIFEST_PATH)/manifest_nfc.xml
+
+ifeq ($(filter $(TARGET_DEVICE), a10),)
+DEVICE_MANIFEST_FILE += $(MANIFEST_PATH)/manifest_fingerprint.xml
+endif
diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index dd61d60..bd588a2 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -17,15 +17,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBiometricsFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
diff --git a/universal7885-common/configs/vintf/manifest_fingerprint.xml b/universal7885-common/configs/vintf/manifest_fingerprint.xml
new file mode 100644
index 0000000..115dd7b
--- /dev/null
+++ b/universal7885-common/configs/vintf/manifest_fingerprint.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IBiometricsFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>