diff --git a/README.md b/README.md
index 9c61a28..64cc9fc 100644
--- a/README.md
+++ b/README.md
@@ -73,10 +73,14 @@ cat <<EOF > .repo/local_manifests/roomservice.xml
 <manifest>
   <project name="WeAreFairphone/android_device_fairphone_FP3" path="device/fairphone/FP3" revision="lineage-16.0" remote="github" />
   <project name="WeAreFairphone/android_kernel_fairphone_sdm632" path="kernel/fairphone/sdm632" revision="lineage-16.0" remote="github" />
+  <remove-project name="LineageOS/android_hardware_qcom_audio" />
+  <project name="WeAreFairphone/android_hardware_qcom_audio" path="hardware/qcom/audio-caf/msm8996" revision="v1-pie-caf-8996" remote="github" />
   <project name="FairBlobs/proprietary_vendor_fairphone" path="vendor/fairphone/FP3" revision="lineage-16.0" remote="github" />
   <project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" />
   <project name="LineageOS/android_external_bson" path="external/bson" remote="github" />
   <project name="LineageOS/android_system_qcom" path="system/qcom" remote="github" />
+  <remove-project name="LineageOS/android_external_chromium-webview"/>
+  <project path="external/chromium-webview" name="LineageOS/android_external_chromium-webview" groups="pdk" revision="lineage-16.0" />
 </manifest>
 EOF
 ```
@@ -105,11 +109,15 @@ cat <<EOF > manifests/FP3.xml
 <manifest>
   <project name="WeAreFairphone/android_device_fairphone_FP3" path="device/fairphone/FP3" revision="lineage-16.0" remote="github" />
   <project name="WeAreFairphone/android_kernel_fairphone_sdm632" path="kernel/fairphone/sdm632" revision="lineage-16.0" remote="github" />
+  <remove-project name="LineageOS/android_hardware_qcom_audio" />
+  <project name="WeAreFairphone/android_hardware_qcom_audio" path="hardware/qcom/audio-caf/msm8996" revision="v1-pie-caf-8996" remote="github" />
   <project name="FairBlobs/proprietary_vendor_fairphone" path="vendor/fairphone/FP3" revision="lineage-16.0" remote="github" />
   <project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" />
   <project name="LineageOS/android_external_bson" path="external/bson" remote="github" />
   <project name="LineageOS/android_system_qcom" path="system/qcom" remote="github" />
   <project name="lineageos4microg/android_prebuilts_prebuiltapks" path="prebuilts/prebuiltapks" remote="github" revision="master" />
+  <remove-project name="LineageOS/android_external_chromium-webview"/>
+  <project path="external/chromium-webview" name="LineageOS/android_external_chromium-webview" groups="pdk" revision="lineage-16.0" />
 </manifest>
 EOF
 ```
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 50e4f19..bc3c05c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -29,12 +29,6 @@ vendor/lib64/libaudcal.so
 vendor/lib64/libaudioalsa.so
 vendor/lib64/libqtigef.so
 
--vendor/lib/libaudioparsers.so
--vendor/lib/libaudio_log_utils.so
--vendor/lib64/libaudioparsers.so
--vendor/lib64/libaudio_log_utils.so
-
-
 vendor/lib/soundfx/libqcomvisualizer.so
 vendor/lib/soundfx/libqcbassboost.so
 vendor/lib/soundfx/libqcompostprocbundle.so
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 34bb9f0..e42f27c 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -242,6 +242,9 @@ on boot
     # Wifi firmware reload path
     chown wifi wifi /sys/module/wlan/parameters/fwpath
 
+    # Hack to prevent permanently disabled NFC setting
+    setprop ro.nfc.fw_dl_on_boot 0
+
 # msm specific files that need to be created on /data
 on post-fs-data
     mkdir /data/vendor/misc 01771 system system
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 113f84b..4bbd554 100755
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -5,6 +5,7 @@ ro.fps.pt.errorbin	u:object_r:fps_vendor_prop:s0
 ro.fps.pt.version		u:object_r:fps_vendor_prop:s0
 ro.fps.pt.features	u:object_r:fps_vendor_prop:s0
 ro.fingerprint.module   u:object_r:fps_vendor_prop:s0
+ro.nfc.fw_dl_on_boot    u:object_r:exported_default_prop:s0
 
 #vendor-info.camera
 persist.vendor.camera.            u:object_r:vendor_info_camera_prop:s0