diff --git a/device.mk b/device.mk
index 38f79f0..a53045a 100644
--- a/device.mk
+++ b/device.mk
@@ -63,15 +63,23 @@ PRODUCT_COPY_FILES += \
 
 # NFC
 PRODUCT_PACKAGES += \
+    android.hardware.nfc@1.0-impl \
     com.android.nfc_extras \
     com.nxp.nfc.nq \
+    com.nxp.nfc.nq.xml \
+    libnqnfc-nci \
+    libnqp61-jcop-kit \
+    nfc_nci.nqx.default \
+    NQNfcNci \
     nqnfcee_access.xml \
     nqnfcse_access.xml \
-    NQNfcNci \
-    SecureElement \
-    Tag
+    Tag \
+    vendor.nxp.hardware.nfc@1.1-service
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \
-    $(LOCAL_PATH)/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nxp.conf \
     $(LOCAL_PATH)/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
+
+# Secure element
+PRODUCT_PACKAGES += \
+    SecureElement
diff --git a/manifest.xml b/manifest.xml
index c1d9417..194e03b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -23,12 +23,12 @@
     <hal format="hidl">
         <name>android.hardware.nfc</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>INfc</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.0::INfc/default</fqname>
+        <fqname>@1.1::INfc/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.secure_element</name>
@@ -100,16 +100,6 @@
         </interface>
         <fqname>@1.0::INqNfc/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.nxpnfc</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INxpNfc</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::INxpNfc/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.gnss</name>
         <transport>hwbinder</transport>
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
deleted file mode 100644
index 5f49bd4..0000000
--- a/rootdir/etc/init.target.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-on init
-    mount none /system/etc/libnfc-nxp.conf /vendor/etc/libnfc-nxp.conf bind
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
deleted file mode 100644
index fc68ada..0000000
--- a/sepolicy/private/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-# NFC config
-/system/etc/libnfc-nxp\.conf u:object_r:vendor_configs_file:s0