diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index eff901f..5c9a67e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -34,6 +34,7 @@ BOARD_USES_ALSA_AUDIO := true
 TARGET_PROVIDES_AUDIO_HAL := true
 TARGET_PROVIDES_LIBAGM := true
 TARGET_PROVIDES_LIBAR_PAL := true
+TARGET_USES_QCOM_MM_AUDIO := true
 
 # Boot
 BOARD_BOOT_HEADER_VERSION := 4
diff --git a/common.mk b/common.mk
index 9158b89..970f77e 100644
--- a/common.mk
+++ b/common.mk
@@ -126,11 +126,12 @@ PRODUCT_PACKAGES += \
     fastbootd
 
 # Fingerprint
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint-service.samsung
+
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
-$(call soong_config_set,surfaceflinger,udfps_lib,//hardware/samsung:libudfps_extension.samsung)
-
 # GPS
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml
@@ -265,16 +266,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml
 
 # Soong namespaces
-SOONG_CONFIG_NAMESPACES += samsung_udfps
-SOONG_CONFIG_samsung_udfps += udfps_zorder
-SOONG_CONFIG_samsung_udfps_udfps_zorder := 0
-
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
     hardware/samsung \
     kernel/samsung/sm8650 \
-    kernel/samsung/sm8650-modules \
-    hardware/samsung/fingerprint
+    kernel/samsung/sm8650-modules
 
 # Telephony
 PRODUCT_PACKAGES += \