diff --git a/FP6.xml b/FP6.xml
index e7c31e74a063246ade3bc8eb061f6e6c61c6f681..826f1df309f660cdf3f8b4ba48dab760869fabc5 100644
--- a/FP6.xml
+++ b/FP6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="e/devices/android_device_fairphone_FP6" path="device/fairphone/FP6" remote="e-priv" />
-  <project name="e/devices/android_device_fairphone_FP6-kernel" path="device/fairphone/FP6-kernel" remote="e-priv" />
+  <project name="e/devices/android_device_fairphone_FP6" path="device/fairphone/FP6" remote="e" />
+  <project name="e/devices/android_device_fairphone_FP6-kernel" path="device/fairphone/FP6-kernel" remote="e" />
 
   <remove-project path="device/qcom/sepolicy_vndr/sm8650" name="LineageOS/android_device_qcom_sepolicy_vndr" groups="qcom,lanai-vendor" revision="lineage-22.2-caf-sm8650" />
   <remove-project path="frameworks/opt/telephony" name="LineageOS/android_frameworks_opt_telephony" groups="pdk" />
@@ -10,9 +10,9 @@
   <remove-project path="hardware/qcom-caf/sm8650/audio/primary-hal" name="LineageOS/android_hardware_qcom_audio-ar" groups="qcom,lanai-audio" revision="lineage-22.2-caf-sm8650" />
   <remove-project path="hardware/qcom-caf/sm8650/audio/graphservices" name="LineageOS/android_vendor_qcom_opensource_audioreach-graphservices" groups="qcom" revision="lineage-22.2-caf-sm8650" />
 
-  <project path="device/qcom/sepolicy_vndr/sm8650" name="e/devices/FP6/android_device_qcom_sepolicy_vndr" groups="qcom,lanai-vendor" revision="a15-caf-sm8650" remote="e-priv" />
+  <project path="device/qcom/sepolicy_vndr/sm8650" name="e/os/android_device_qcom_sepolicy_vndr" groups="qcom,lanai-vendor" revision="a15-caf-sm8650" remote="e" />
   <project path="frameworks/opt/telephony" name="e/os/android_frameworks_opt_telephony" groups="pdk" remote="e" revision="v1-a15-FP6" />
-  <project path="hardware/qcom-caf/sm8650/audio/agm" name="e/devices/FP6/android_vendor_qcom_opensource_agm" groups="qcom,lanai-audio" revision="a15-caf-sm8650" remote="e-priv" />
-  <project path="hardware/qcom-caf/sm8650/audio/pal" name="e/devices/FP6/android_vendor_qcom_opensource_arpal-lx" groups="qcom,lanai-audio" revision="a15-caf-sm8650" remote="e-priv" />
-  <project path="hardware/qcom-caf/sm8650/audio/primary-hal" name="e/devices/FP6/android_hardware_qcom_audio-ar" groups="qcom,lanai-audio" revision="a15-caf-sm8650" remote="e-priv" />
+  <project path="hardware/qcom-caf/sm8650/audio/agm" name="e/os/android_vendor_qcom_opensource_agm" groups="qcom,lanai-audio" revision="a15-caf-sm8650" remote="e" />
+  <project path="hardware/qcom-caf/sm8650/audio/pal" name="e/os/android_vendor_qcom_opensource_arpal-lx" groups="qcom,lanai-audio" revision="a15-caf-sm8650" remote="e" />
+  <project path="hardware/qcom-caf/sm8650/audio/primary-hal" name="e/os/android_hardware_qcom_audio-ar" groups="qcom,lanai-audio" revision="a15-caf-sm8650" remote="e" />
 </manifest>