diff --git a/common.mk b/common.mk
index a6f13af..e52ab11 100644
--- a/common.mk
+++ b/common.mk
@@ -344,6 +344,18 @@ PRODUCT_PACKAGES += \
 # Recovery
 $(call soong_config_set_bool,recovery,target_recovery_uses_qti_drm,true)
 
+# SecureElement
+ifneq ($(TARGET_IS_TABLET),true)
+PRODUCT_PACKAGES += \
+    SecureElementResTarget_Vendor
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/hal_uuid_map_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hal_uuid_map_23.xml \
+    $(LOCAL_PATH)/configs/hal_uuid_map_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hal_uuid_map_29.xml \
+    $(LOCAL_PATH)/configs/hal_uuid_map_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hal_uuid_map_31.xml \
+    $(LOCAL_PATH)/configs/hal_uuid_map_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hal_uuid_map_config.xml
+endif
+
 # Sensors
 PRODUCT_PACKAGES += \
     android.hardware.sensors-service.multihal \
diff --git a/configs/hal_uuid_map_config.xml b/configs/hal_uuid_map_config.xml
new file mode 100644
index 0000000..d0a6dff
--- /dev/null
+++ b/configs/hal_uuid_map_config.xml
@@ -0,0 +1,42 @@
+<!-- Vendor mapping file -->
+<!-- Sample UUID to list of UIDs mapping file -->
+
+<!-- UUID: Universally Unique IDentifier -->
+<!-- 16 Byte UUID need to be generated by vendors to add new entry -->
+<!-- As per global platform access control spec, UUID is expected to be of -->
+<!-- length 20 bytes. While using this UUID, it is expected to be -->
+<!-- automatically padded with ffffffff in initial 4 bytes of 20 Byte length -->
+
+<!-- UID: user identifier of the service -->
+
+<!-- This mapping file should contain an entry for VTS tests, since VTS -->
+<!-- tests run as root, user identifier 0 should be mapped to its -->
+<!-- corresponding UUID to allow VTS tests to access secure element -->
+<!-- For VTS tests use UID: 0 and UUID: 9f36407ead0639fc966f14dde7970f68 -->
+
+<ref_do>
+    <!-- mapping entries to map unique identifiers to device hal services -->
+    <!-- uids -->
+
+    <!-- UUID would be automatically padding with ffffffff to fulfill 20 -->
+    <!-- bytes in access rule. For example for -->
+    <!-- UUID:9f36407ead0639fc966f14dde7970f68 after padding it should look -->
+    <!-- like ffffffff9f36407ead0639fc966f14dde7970f68 -->
+    <uuid_ref_do>
+        <uids>
+            <uid>0</uid>
+        </uids>
+        <uuid>9f36407ead0639fc966f14dde7970f68</uuid>
+    </uuid_ref_do>
+
+    <!-- Sample mapping entry with UIDs:1096 and 1097 mapped to -->
+    <!-- UUID:9f36407ead0639fc966f14dde7970f68 -->
+    <uuid_ref_do>
+        <uids>
+            <uid>2910</uid>
+            <uid>2911</uid>
+            <uid>2915</uid>
+        </uids>
+        <uuid>636F6D2E6E78702E7365637572697479</uuid>
+    </uuid_ref_do>
+</ref_do>
diff --git a/overlay/SecureElement/Android.bp b/overlay/SecureElement/Android.bp
new file mode 100644
index 0000000..9149b1a
--- /dev/null
+++ b/overlay/SecureElement/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SecureElementResTarget_Vendor",
+    vendor: true,
+}
diff --git a/overlay/SecureElement/AndroidManifest.xml b/overlay/SecureElement/AndroidManifest.xml
new file mode 100644
index 0000000..8f526ef
--- /dev/null
+++ b/overlay/SecureElement/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Copyright (c) 2024, Qualcomm Technologies, Inc.
+    All Rights Reserved.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.se.overlay.target">
+    <overlay android:targetPackage="com.android.se" android:isStatic="true" android:priority="500"/>
+</manifest>
diff --git a/overlay/SecureElement/res/values/config.xml b/overlay/SecureElement/res/values/config.xml
new file mode 100644
index 0000000..f706abf
--- /dev/null
+++ b/overlay/SecureElement/res/values/config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Copyright (c) 2024, Qualcomm Technologies, Inc.
+    All Rights Reserved.
+-->
+<resources>
+    <!-- The list of AIDs are the candidate of the ARA AID in ESE.
+         The first available AID will be taken as the ARA AID. -->
+    <string-array name="config_ara_aid_candidate_list_ese" translatable="false" />
+
+    <!-- To enable vendor stable service, set this to true and
+         make sure its vntf manifest entry is also configured. -->
+    <bool name="secure_element_vintf_enabled">true</bool>
+</resources>
diff --git a/proprietary-files-phone.txt b/proprietary-files-phone.txt
index 11e7cb6..e1d4e3c 100644
--- a/proprietary-files-phone.txt
+++ b/proprietary-files-phone.txt
@@ -376,7 +376,9 @@ system/etc/permissions/uimremoteserver.xml
 odm/etc/vintf/manifest/secure_element-service.xml
 vendor/bin/hw/android.hardware.secure_element-service.qti
 vendor/etc/init/android.hardware.secure_element-service.qti.rc
+vendor/etc/permissions/com.android.se.xml
 vendor/etc/vintf/manifest/android.hardware.secure_element.xml
+vendor/etc/vintf/manifest/secure_element-service.xml:vendor/etc/vintf/manifest/secure_element-service-omapi.xml
 vendor/lib64/hw/libEseUtils.so
 vendor/lib64/libGPMTEEC_vendor.so
 vendor/lib64/libGPQeSE.so