diff --git a/device.mk b/device.mk
index 68de510..8eb9007 100644
--- a/device.mk
+++ b/device.mk
@@ -50,7 +50,7 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.2-service.st \
+    android.hardware.nfc@1.2-service.samsung \
     com.android.nfc_extras \
     Tag
 
diff --git a/extract-files.py b/extract-files.py
index 9acd834..d32f7f9 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -31,6 +31,9 @@ lib_fixups: lib_fixups_user_type = {
 }
 
 blob_fixups: blob_fixups_user_type = {
+    'vendor/etc/init/android.hardware.nfc@1.2-service.sec.rc': blob_fixup()
+        .regex_replace('sec', 'samsung')
+        .regex_replace('class hal\n    user nfc', 'override\n    class hal\n    user nfc'),
     'vendor/lib64/libBSTSWAD.so': blob_fixup()
         .clear_symbol_version('AHardwareBuffer_allocate')
         .clear_symbol_version('AHardwareBuffer_describe')
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 04e125c..d6e2e1b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -244,6 +244,7 @@ system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
 
 # NFC
+vendor/etc/init/android.hardware.nfc@1.2-service.sec.rc
 vendor/etc/init/init.nfc.sec.rc
 
 # NFC - configs
diff --git a/vendor.prop b/vendor.prop
index 3abe2ad..8a796e6 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,5 +1,2 @@
 # Camera
 persist.vendor.camera.physical.num=4
-
-# NFC
-ro.vendor.hw.nfc=st