diff --git a/a10/proprietary-files.txt b/a10/proprietary-files.txt
index 3a97000..44735da 100644
--- a/a10/proprietary-files.txt
+++ b/a10/proprietary-files.txt
@@ -1,4 +1,99 @@
+# Blobs not symlinked in vendor tree are from samsung/a10kx/a10:11/RP1A.200720.012/A105NKOU5CUL4:user/release-keys
+# Symlinked ones are from samsung/a20ektt/a20e:11/RP1A.200720.012/A202KKKU8CUL3:user/release-keys.
+
+# Audio
+vendor/lib/hw/audio.primary.exynos7884B.so
+vendor/lib/soundfx/libswdap.so
+vendor/lib/vndk/libaudioroute.so
+vendor/lib/libacryl.so
+vendor/lib/libaudio-ril.so
+vendor/lib/libaudio_soundtrigger.so
+vendor/lib/librecordalive.so
+vendor/lib/libsamsungDiamondVoice.so
+vendor/lib64/libacryl.so
+
+# Camera
+vendor/lib/hw/camera.exynos7884B.so
+vendor/lib/libOpenCv.camera.samsung.so
+vendor/lib/libSEF.quram.so
+vendor/lib/libexynosv4l2.so
+vendor/lib/libgiantmscl.so
+vendor/lib/libhwjpeg.so
+vendor/lib/libsaiv_BeautySolutionVideo.so
+vendor/lib/libuniapi.so
+vendor/lib/libuniplugin.so
+vendor/lib/libvideobeauty_interface.so
+vendor/lib64/libOpenCv.camera.samsung.so
+vendor/lib64/libSEF.quram.so
+vendor/lib/libexynoscamera3.so
+vendor/lib64/libexynosv4l2.so
+vendor/lib64/libgiantmscl.so
+vendor/lib64/libsaiv_BeautySolutionVideo.so
+vendor/lib64/libuniapi.so
+vendor/lib64/libuniplugin.so
+vendor/lib64/libvideobeauty_interface.so
+
+# Exynos HWC
+vendor/lib/hw/hwcomposer.exynos7884B.so
+vendor/lib/libExynosHWCService.so
+vendor/lib/libexynosdisplay.so
+vendor/lib/libexynosgraphicbuffer.so
+vendor/lib/libexynosgscaler.so
+vendor/lib/libexynosscaler.so
+vendor/lib/libexynosutils.so
+vendor/lib64/hw/hwcomposer.exynos7884B.so
+vendor/lib64/libExynosHWCService.so
+vendor/lib64/libexynosdisplay.so
+vendor/lib64/libexynosgraphicbuffer.so
+vendor/lib64/libexynosgscaler.so
+vendor/lib64/libexynosscaler.so
+vendor/lib64/libexynosutils.so
+
+# Fingerprint
+vendor/lib/libegis_fp_normal_sensor_test.so
+vendor/lib64/libegis_fp_normal_sensor_test.so
+
+# Sensors
+vendor/etc/yas_set.cfg
+vendor/lib/hw/sensors.universal7884B.so
+vendor/lib/libsensorlistener.so
+vendor/lib/libyasalgo.so
+vendor/lib64/libsensorlistener.so
+vendor/lib64/libyasalgo.so
+
+# GPS
vendor/bin/hw/gpsd
+vendor/lib/libwrappergps.so
+vendor/lib64/libwrappergps.so
+
+# RIL
+vendor/lib64/libengmode_client.so
+vendor/lib64/libvkmanager_vendor.so
+
+# HW Modules for 7884B
+vendor/lib/hw/gatekeeper.exynos7884B.so
+vendor/lib/hw/gralloc.exynos7884B.so
+vendor/lib/hw/memtrack.exynos7884B.so
+vendor/lib/hw/thermal.universal7884B.so
+vendor/lib64/hw/gatekeeper.exynos7884B.so
+vendor/lib64/hw/gralloc.exynos7884B.so
+vendor/lib64/hw/memtrack.exynos7884B.so
+vendor/lib64/hw/thermal.universal7884B.so
+
+# Media
+vendor/etc/mixer_gains.xml
+vendor/etc/mixer_paths.xml
+
+# Firmware
+vendor/firmware/nfc/sec_s3nrn82_firmware.bin
+vendor/firmware/dax_param.bin
+vendor/firmware/fimc_is_lib.bin
+vendor/firmware/fimc_is_rta.bin
+vendor/firmware/mfc_fw.bin
+vendor/firmware/setfile_3l6.bin
+vendor/firmware/setfile_5e9.bin
+
+# Wifi
vendor/etc/wifi/mx140/debug/common/log-strings.bin
vendor/etc/wifi/mx140/debug/hardware/moredump/bt_registers.xml
vendor/etc/wifi/mx140/debug/hardware/moredump/cortexM4.xml
@@ -55,34 +150,3 @@ vendor/etc/wifi/p2p_supplicant_overlay.conf
vendor/etc/wifi/platform.txt
vendor/etc/wifi/wpa_supplicant.conf
vendor/etc/wifi/wpa_supplicant_overlay.conf
-vendor/etc/mixer_gains.xml
-vendor/etc/mixer_paths.xml
-vendor/firmware/dax_param.bin
-vendor/firmware/fimc_is_lib.bin
-vendor/firmware/fimc_is_rta.bin
-vendor/firmware/mfc_fw.bin
-vendor/firmware/setfile_3l6.bin
-vendor/firmware/setfile_5e9.bin
-vendor/lib/hw/camera.exynos7884B.so
-vendor/lib/hw/sensors.universal7884B.so
-vendor/lib/soundfx/libswdap.so
-vendor/lib/libExynosHWCService.so
-vendor/lib/libexynoscamera3.so
-vendor/lib/libexynosdisplay.so
-vendor/lib/libexynosgraphicbuffer.so
-vendor/lib/libexynosgscaler.so
-vendor/lib/libexynosscaler.so
-vendor/lib/libexynosutils.so
-vendor/lib/libexynosv4l2.so
-vendor/lib/libhwjpeg.so
-vendor/lib/libsensorlistener.so
-vendor/lib/libwrappergps.so
-vendor/lib64/libExynosHWCService.so
-vendor/lib64/libexynosdisplay.so
-vendor/lib64/libexynosgraphicbuffer.so
-vendor/lib64/libexynosgscaler.so
-vendor/lib64/libexynosscaler.so
-vendor/lib64/libexynosutils.so
-vendor/lib64/libexynosv4l2.so
-vendor/lib64/libsensorlistener.so
-vendor/lib64/libwrappergps.so
diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index 2b9f628..2458fc3 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -34,8 +34,8 @@
hwbinder
@1.0::ICryptoFactory/default
@1.0::IDrmFactory/default
- @1.3::ICryptoFactory/widevine
- @1.3::IDrmFactory/widevine
+ @1.4::ICryptoFactory/widevine
+ @1.4::IDrmFactory/widevine
android.hardware.gatekeeper
diff --git a/universal7885-common/proprietary-files.txt b/universal7885-common/proprietary-files.txt
index 0225dee..cd4f9d5 100644
--- a/universal7885-common/proprietary-files.txt
+++ b/universal7885-common/proprietary-files.txt
@@ -1,6 +1,7 @@
# All blobs below are extracted from samsung/a20ektt/a20e:11/RP1A.200720.012/A202KKKU8CUL3:user/release-keys, unless otherwise stated.
+# Widevine DRM blobs from exynos9820 common
-vendor/bin/hw/android.hardware.drm@1.3-service.widevine
+vendor/bin/hw/android.hardware.drm@1.4-service.widevine
vendor/bin/hw/macloader
vendor/bin/hw/rild
vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service
@@ -13,7 +14,7 @@ vendor/etc/dolby/dax-default.xml
vendor/etc/gnss/ca.pem
vendor/etc/gnss/gps.cfg
vendor/etc/gnss/gps.debug.cfg
-vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
+vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
vendor/etc/init/init.gps.rc
vendor/etc/init/init.vendor.rilchip.rc
vendor/etc/init/init.vendor.rilcommon.rc
@@ -34,7 +35,7 @@ vendor/firmware/Tfa9896.cnt
vendor/firmware/calliope_dram.bin
vendor/firmware/calliope_sram.bin
vendor/lib/egl/libGLES_mali.so
-vendor/lib/mediadrm/libwvdrmengine.so
+vendor/lib/libdrmresource.so
vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so
vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so
vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 8adfbca..212936b 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -78,7 +78,8 @@ PRODUCT_PACKAGES += \
android.hardware.drm@1.4-service.clearkey \
android.hardware.drm@1.1.vendor \
android.hardware.drm@1.2.vendor \
- android.hardware.drm@1.3.vendor
+ android.hardware.drm@1.3.vendor \
+ android.hardware.drm@1.4.vendor
# Fingerprint
TARGET_BOARD_HAS_FP ?= true