diff --git a/common.mk b/common.mk
index cce6490..25a9e56 100644
--- a/common.mk
+++ b/common.mk
@@ -273,12 +273,15 @@ PRODUCT_PACKAGES += \
     android.hardware.neuralnetworks@1.3.vendor
 
 # NFC
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/nxp/opensource/sn100x
+
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.2.vendor \
     android.hardware.secure_element@1.2.vendor \
     com.android.nfc_extras \
     NfcNci \
     nqnfcinfo \
+    vendor.nxp.hardware.nfc@2.0-service \
     Tag
 
 PRODUCT_COPY_FILES += \
diff --git a/extract-files.sh b/extract-files.sh
index befaa7b..18988d6 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -66,6 +66,10 @@ function blob_fixup() {
         system_ext/lib64/libwfdnative.so)
             sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}"
             ;;
+        vendor/etc/libnfc-mtp-SN100.conf)
+            sed -i "s/^NXP_RF_CONF_BLK_9/#NXP_RF_CONF_BLK_9/" "${2}"
+            sed -i "s/^NXP_RF_CONF_BLK_10/#NXP_RF_CONF_BLK_10/" "${2}"
+            ;;
         vendor/lib64/hw/com.qti.chi.override.so)
             "${SIGSCAN}" -p "9B 2B 04 94" -P "1F 20 03 D5" -f "${2}"
             "${SIGSCAN}" -p "46 23 04 94" -P "1F 20 03 D5" -f "${2}"
diff --git a/manifest.xml b/manifest.xml
index 52e6fb9..314beb1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -81,6 +81,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
@@ -172,6 +181,15 @@
             <instance>com.qualcomm.qti.uceservice</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.nxp.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>INqNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.oplus.hardware.appradio</name>
         <transport>hwbinder</transport>
@@ -212,6 +230,15 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.esepowermanager</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IEsePowerManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e3966f0..7d175b8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -861,85 +861,9 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # NFC
-odm/bin/hw/vendor.nxp.hardware.nfc@1.2-service
-odm/etc/init/init.SN100x.nfc.rc
-odm/etc/init/vendor.nxp.hardware.nfc@1.2-service.rc
-odm/etc/vintf/manifest/manifest_nfc_sn100t.xml
-odm/etc/libnfc-nci.conf
-odm/lib64/nfc_nci.nqx.default.hw.so
-odm/lib64/vendor.nxp.hardware.nfc@1.0.so
-odm/lib64/vendor.nxp.hardware.nfc@1.1.so
-
-# NFC configs
-odm/etc/nfc/libnfc-mtp-SN100.conf_19065
-odm/etc/nfc/libnfc-mtp-SN100.conf_19066
-odm/etc/nfc/libnfc-mtp-SN100.conf_19161
-odm/etc/nfc/libnfc-mtp-SN100.conf_19361
-odm/etc/nfc/libnfc-mtp-SN100.conf_19361_TW
-odm/etc/nfc/libnfc-mtp-SN100.conf_19362
-odm/etc/nfc/libnfc-mtp-SN100.conf_19362_JP
-odm/etc/nfc/libnfc-mtp-SN100.conf_19705
-odm/etc/nfc/libnfc-mtp-SN100.conf_19795
-odm/etc/nfc/libnfc-mtp-SN100.conf_19805
-odm/etc/nfc/libnfc-mtp-SN100.conf_19811
-odm/etc/nfc/libnfc-mtp-SN100.conf_19821
-odm/etc/nfc/libnfc-mtp-SN100.conf_19855
-odm/etc/nfc/libnfc-mtp-SN100.conf_20061
-odm/etc/nfc/libnfc-mtp-SN100.conf_20062
-odm/etc/nfc/libnfc-mtp-SN100.conf_20135
-odm/etc/nfc/libnfc-mtp-SN100.conf_20139
-odm/etc/nfc/libnfc-mtp-SN100.conf_20161
-odm/etc/nfc/libnfc-mtp-SN100.conf_20235
-odm/etc/nfc/libnfc-mtp-SN100.conf_20351
-odm/etc/nfc/libnfc-mtp-SN100.conf_20352
-odm/etc/nfc/libnfc-mtp-SN100.conf_20607
-odm/etc/nfc/libnfc-mtp-SN100.conf_20809
-odm/etc/nfc/libnfc-mtp-SN100.conf_20828
-odm/etc/nfc/libnfc-mtp-SN100.conf_21615
-odm/etc/nfc/libnfc-mtp-SN100.conf_21619
-odm/etc/nfc/libnfc-mtp-SN100.conf_2161A
-odm/etc/nfc/libnfc-mtp-SN100.conf_2169A
-odm/etc/nfc/libnfc-mtp-SN100.conf_2169B
-odm/etc/nfc/libnfc-nci.conf_19065
-odm/etc/nfc/libnfc-nci.conf_19066
-odm/etc/nfc/libnfc-nci.conf_19161
-odm/etc/nfc/libnfc-nci.conf_19361
-odm/etc/nfc/libnfc-nci.conf_19361_TW
-odm/etc/nfc/libnfc-nci.conf_19362
-odm/etc/nfc/libnfc-nci.conf_19362_JP
-odm/etc/nfc/libnfc-nci.conf_19705
-odm/etc/nfc/libnfc-nci.conf_19795
-odm/etc/nfc/libnfc-nci.conf_19805
-odm/etc/nfc/libnfc-nci.conf_19811
-odm/etc/nfc/libnfc-nci.conf_19821
-odm/etc/nfc/libnfc-nci.conf_19855
-odm/etc/nfc/libnfc-nci.conf_20061
-odm/etc/nfc/libnfc-nci.conf_20062
-odm/etc/nfc/libnfc-nci.conf_20135
-odm/etc/nfc/libnfc-nci.conf_20139
-odm/etc/nfc/libnfc-nci.conf_20161
-odm/etc/nfc/libnfc-nci.conf_20235
-odm/etc/nfc/libnfc-nci.conf_20351
-odm/etc/nfc/libnfc-nci.conf_20352
-odm/etc/nfc/libnfc-nci.conf_20607
-odm/etc/nfc/libnfc-nci.conf_20809
-odm/etc/nfc/libnfc-nci.conf_20828
-odm/etc/nfc/libnfc-nci.conf_21615
-odm/etc/nfc/libnfc-nci.conf_21619
-odm/etc/nfc/libnfc-nci.conf_2161A
-odm/etc/nfc/libnfc-nci.conf_2169A
-odm/etc/nfc/libnfc-nci.conf_2169B
-odm/etc/libnfc-nci.conf
-odm/etc/libnfc-nxp-pnscr.conf
-
-# NFC firmware
-odm/etc/nfc/nfc_conf_ref
-odm/etc/nfc/nfc_fw_ref
-odm/etc/nfc/sn100u.bin_sn100t_fw_01_10_53
-odm/etc/nfc/sn100u.bin_sn100t_fw_01_10_57
-odm/etc/nfc/st21nfc_fw.bin_st21h
-odm/etc/nfc/st21nfc_fw7.bin_st21h
-odm/lib/libsn100u_fw.so
+odm/etc/nfc/libnfc-mtp-SN100.conf_19805:vendor/etc/libnfc-mtp-SN100.conf
+odm/etc/nfc/libnfc-nci.conf_19805:vendor/etc/libnfc-nci.conf
+odm/lib/libsn100u_fw.so:vendor/lib/libsn100u_fw.so
 
 # OMX
 vendor/lib/libAlacSwDec.so