diff --git a/two.xml b/two.xml
index 4cd3eaf0ad9de545b4e1a878f589f863ae6aab7c..b6cf440505680082ee0d355631f37c8a8284971f 100644
--- a/two.xml
+++ b/two.xml
@@ -16,4 +16,10 @@
   <remove-project path="packages/modules/Wifi" name="LineageOS/android_packages_modules_Wifi" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/modules/Wifi" name="e/os/android_packages_modules_Wifi" groups="pdk-cw-fs,pdk-fs" remote="e" />
 
+  <remove-project path="packages/modules/Bluetooth" name="LineageOS/android_packages_modules_Bluetooth" groups="pdk" />
+  <project path="packages/modules/Bluetooth" name="e/os/android_packages_modules_Bluetooth" groups="pdk" remote="e" />
+
+  <remove-project path="frameworks/av" name="LineageOS/android_frameworks_av" groups="pdk" />
+  <project path="frameworks/av" name="e/os/android_frameworks_av" groups="pdk" remote="e-priv"/>
+
 </manifest>