diff --git a/gsi.xml b/gsi.xml
index a7987bc..5070f2d 100644
--- a/gsi.xml
+++ b/gsi.xml
@@ -3,19 +3,23 @@
   <remote name="angry" fetch="https://gitea.angry.im/" />
   <remote name="github" fetch="https://github.com/" />
 
-  <project path="patches" name="PeterGSI/patches" remote="angry" revision="aosp13">
+  <project path="patches" name="PeterGSI/patches" remote="angry" revision="aosp15">
     <linkfile dest="apply_patches.sh" src="apply.sh" />
   </project>
 
-  <project path="device/peter/gsi" name="PeterGSI/android_device_peter_gsi" remote="angry" revision="aosp14" />
-  <project path="vendor/hardware_overlay" name="PeterGSI/android_vendor_hardware_overlay" remote="angry" revision="aosp14" />
-  <project path="packages/apps/QcRilAm" name="PeterGSI/android_packages_apps_QcRilAm" remote="angry" revision="master" />
-  <project path="vendor/foss" name="PeterGSI/android_vendor_foss" remote="angry" revision="aosp14">
+  <project path="device/peter/gsi" name="PeterGSI/android_device_peter_gsi" remote="angry" revision="aosp15" />
+  <project path="vendor/hardware_overlay" name="PeterGSI/android_vendor_hardware_overlay" remote="angry" revision="aosp15" />
+  <project path="packages/apps/QcRilAm" name="AndyCGYan/android_packages_apps_QcRilAm" remote="github" revision="master" />
+  <project path="vendor/foss" name="PeterGSI/android_vendor_foss" remote="angry" revision="aosp15">
     <linkfile dest="update_foss.sh" src="update.sh" />
   </project>
 
   <!-- Extra source-built apps -->
-  <project path="packages/apps/ExactCalculator" name="LineageOS/android_packages_apps_ExactCalculator" remote="github" revision="lineage-20.0"/>
+  <project path="packages/apps/ExactCalculator" name="LineageOS/android_packages_apps_ExactCalculator" remote="github" revision="lineage-21.0"/>
   <project path="packages/apps/OpenEUICC" name="PeterCxy/OpenEUICC" remote="angry" revision="master" sync-s="true" />
   <project path="prebuilts/openeuicc-deps" name="PeterCxy/android_prebuilts_openeuicc-deps" remote="angry" revision="master" />
+  <remove-project name="platform/packages/apps/Dialer" />
+  <project path="packages/apps/Dialer" name="LineageOS/android_packages_apps_Dialer" remote="github" revision="lineage-22.0" />
+  <project path="lineage-sdk" name="LineageOS/android_lineage-sdk" remote="github" revision="lineage-22.0" />
+  <project path="vendor/lineage-spn" name="PeterGSI/android_vendor_lineage-spn" remote="angry" revision="aosp15" />
 </manifest>