diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3ee23c5..20c696c 100755
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -482,10 +482,10 @@ vendor/lib64/libsynaFpSensorTestNwd.so;DISABLE_CHECKELF
 vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so
 
 # NFC
-vendor/bin/hw/nxp.android.hardware.nfc@1.1-service
+vendor/bin/hw/nxp.android.hardware.nfc@1.1-service:vendor/bin/hw/nxp.android.hardware.nfc@1.1-service.samsung;DISABLE_CHECKELF
 vendor/etc/init/init.nfc.samsung.rc
-vendor/etc/init/nxp.android.hardware.nfc@1.1-service.rc
-vendor/lib64/nfc_nci_nxp.so
+vendor/etc/init/nxp.android.hardware.nfc@1.1-service.rc:vendor/etc/init/nxp.android.hardware.nfc@1.1-service.samsung.rc;DISABLE_CHECKELF
+vendor/lib64/nfc_nci_nxp.so;MODULE_SUFFIX=_vendor
 vendor/lib64/vendor.nxp.nxpnfc@1.1.so
 
 # NFC (Firmware)
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index bfdb2ba..45dc65a 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -1,3 +1,3 @@
 # HALs
-/(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.1-service                        u:object_r:hal_nfc_default_exec:s0
-/(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.2-service                        u:object_r:hal_nfc_default_exec:s0
+/(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.1-service.samsung                        u:object_r:hal_nfc_default_exec:s0
+/(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.2-service.samsung                        u:object_r:hal_nfc_default_exec:s0