diff --git a/a20/device.mk b/a20/device.mk
index f006f35..e2a1e6b 100644
--- a/a20/device.mk
+++ b/a20/device.mk
@@ -23,9 +23,6 @@ TARGET_SCREEN_WIDTH := 720
 # Fingerprint
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.samsung
-
 PRODUCT_PACKAGES += \
    fstab.exynos7884B \
    ueventd.exynos7885.rc
diff --git a/a20e/device.mk b/a20e/device.mk
index f2b92ea..bf9e8b0 100644
--- a/a20e/device.mk
+++ b/a20e/device.mk
@@ -23,9 +23,6 @@ TARGET_SCREEN_WIDTH := 720
 # Fingerprint
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.samsung
-    
 PRODUCT_PACKAGES += \
    fstab.exynos7884B \
    ueventd.exynos7885.rc
diff --git a/a30/device.mk b/a30/device.mk
index 220e038..40b2c30 100644
--- a/a30/device.mk
+++ b/a30/device.mk
@@ -19,9 +19,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml
 
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.samsung
-    
 PRODUCT_PACKAGES += \
    fstab.exynos7904 \
    ueventd.exynos7885.rc
diff --git a/a40/device.mk b/a40/device.mk
index ccb534b..e2cb8fb 100644
--- a/a40/device.mk
+++ b/a40/device.mk
@@ -19,9 +19,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml
     
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.samsung
-    
 PRODUCT_PACKAGES += \
    fstab.exynos7904 \
    ueventd.exynos7885.rc
diff --git a/universal7885-common/configs/vintf/manifest.mk b/universal7885-common/configs/vintf/manifest.mk
index 083eeab..8f6f203 100644
--- a/universal7885-common/configs/vintf/manifest.mk
+++ b/universal7885-common/configs/vintf/manifest.mk
@@ -5,10 +5,6 @@ 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
-
 ifneq ($(filter $(TARGET_DEVICE), a40),)
 DEVICE_MANIFEST_FILE += $(MANIFEST_PATH)/manifest_gnss.xml
 endif
diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index a4ae0ce..8b3b02d 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -59,6 +59,15 @@
         <fqname>@1.3::ICryptoFactory/widevine</fqname>
         <fqname>@1.3::IDrmFactory/widevine</fqname>
     </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.gatekeeper</name>
         <transport>hwbinder</transport>
diff --git a/universal7885-common/configs/vintf/manifest_fingerprint.xml b/universal7885-common/configs/vintf/manifest_fingerprint.xml
deleted file mode 100644
index 115dd7b..0000000
--- a/universal7885-common/configs/vintf/manifest_fingerprint.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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>
diff --git a/universal7885-common/sepolicy/vendor/genfs_contexts b/universal7885-common/sepolicy/vendor/genfs_contexts
index 8804e3d..971bdf7 100644
--- a/universal7885-common/sepolicy/vendor/genfs_contexts
+++ b/universal7885-common/sepolicy/vendor/genfs_contexts
@@ -6,6 +6,7 @@ genfscon proc /last_kmsg                                                  u:obje
 ### SYSFS
 genfscon sysfs /bbd                                                       u:object_r:sysfs_bbd:s0
 
+genfscon sysfs /sys/fs/cgroup						     u:object_r:cgroup_v2:s0
 genfscon sysfs /bus/iio/devices                                           u:object_r:sysfs_iio:s0
 
 genfscon sysfs /class/backlight/                                          u:object_r:sysfs_backlight_writable:s0
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 60a2c2c..4dea4c7 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -72,6 +72,10 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.2.vendor \
     android.hardware.drm@1.3.vendor
 
+# Fingerprint
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service.samsung
+
 # Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \