diff --git a/Android.bp b/Android.bp
index 18aa5eb..35f6efa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3483,6 +3483,9 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcrypto",
                 "libsecnativefeature",
+                "libbinder_ndk",
+                "android.hardware.nfc-V1-ndk",
+                "vendor.samsung.hardware.nfc_aidl-V1-ndk",
                 "libc++",
                 "libc",
                 "libm",
@@ -3909,6 +3912,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.nfc_aidl-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.nfc_aidl-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 android_app_import {
     name: "CACertService",
     owner: "samsung",
@@ -3966,6 +3994,40 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "sec.android.hardware.nfc-service",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/hw/sec.android.hardware.nfc-service",
+            ],
+            shared_libs: [
+                "nfc_nci_sec",
+                "android.hardware.nfc-V1-ndk",
+                "vendor.samsung.hardware.nfc_aidl-V1-ndk",
+                "libbase",
+                "libhardware",
+                "liblog",
+                "libutils",
+                "libcrypto",
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    relative_install_path: "hw",
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "loc_launcher",
     owner: "samsung",
diff --git a/proprietary/vendor/bin/hw/sec.android.hardware.nfc-service b/proprietary/vendor/bin/hw/sec.android.hardware.nfc-service
new file mode 100644
index 0000000..bcc2016
Binary files /dev/null and b/proprietary/vendor/bin/hw/sec.android.hardware.nfc-service differ
diff --git a/proprietary/vendor/etc/init/sec-nfc-service.rc b/proprietary/vendor/etc/init/sec-nfc-service.rc
new file mode 100644
index 0000000..711594d
--- /dev/null
+++ b/proprietary/vendor/etc/init/sec-nfc-service.rc
@@ -0,0 +1,10 @@
+service nfc_hal_service /vendor/bin/hw/sec.android.hardware.nfc-service
+    interface aidl android.hardware.nfc.INfc/default
+    interface aidl vendor.samsung.hardware.nfc_aidl.ISehNfc/default
+    class hal
+    oneshot
+    disabled
+    user nfc
+    group nfc net_bt_admin
+on property:ro.vendor.nfc.feature.chipname=SLSI
+    start nfc_hal_service
diff --git a/proprietary/vendor/lib64/nfc_nci_sec.so b/proprietary/vendor/lib64/nfc_nci_sec.so
index 2def712..7d8b0ba 100644
Binary files a/proprietary/vendor/lib64/nfc_nci_sec.so and b/proprietary/vendor/lib64/nfc_nci_sec.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.nfc_aidl-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.nfc_aidl-V1-ndk.so
new file mode 100644
index 0000000..d2a6448
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.nfc_aidl-V1-ndk.so differ
diff --git a/r8q-vendor.mk b/r8q-vendor.mk
index 200a3d6..f99616d 100644
--- a/r8q-vendor.mk
+++ b/r8q-vendor.mk
@@ -20,6 +20,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/etc/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \
     vendor/samsung/r8q/proprietary/vendor/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
     vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
+    vendor/samsung/r8q/proprietary/vendor/etc/init/sec-nfc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/sec-nfc-service.rc \
     vendor/samsung/r8q/proprietary/vendor/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
     vendor/samsung/r8q/proprietary/vendor/etc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf \
     vendor/samsung/r8q/proprietary/vendor/etc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
@@ -216,9 +217,11 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.cacert@1.0 \
     vendor.qti.hardware.qccsyshal@1.0 \
     vendor.samsung.hardware.gnss@2.0 \
+    vendor.samsung.hardware.nfc_aidl-V1-ndk \
     CACertService \
     android.hardware.gnss@2.1-service-qti.xml \
     android.hardware.gnss@2.1-service-qti \
+    sec.android.hardware.nfc-service \
     loc_launcher \
     lowi-server \
     xtra-daemon