diff --git a/gen-remove.sh b/gen-remove.sh
index c0edcec..3cae7d6 100755
--- a/gen-remove.sh
+++ b/gen-remove.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-REMOVE_PREFIXES=("device/google" "prebuilts/android-emulator")
+REMOVE_PREFIXES=("device/google")
 
 echo '<?xml version="1.0" encoding="UTF-8"?>'
 echo '<manifest>'
diff --git a/gsi.xml b/gsi.xml
index 5070f2d..09e20c7 100644
--- a/gsi.xml
+++ b/gsi.xml
@@ -3,23 +3,25 @@
   <remote name="angry" fetch="https://gitea.angry.im/" />
   <remote name="github" fetch="https://github.com/" />
 
-  <project path="patches" name="PeterGSI/patches" remote="angry" revision="aosp15">
+  <project path="patches" name="PeterGSI/patches" remote="angry" revision="aosp17">
     <linkfile dest="apply_patches.sh" src="apply.sh" />
   </project>
 
-  <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="device/peter/gsi" name="PeterGSI/android_device_peter_gsi" remote="angry" revision="aosp17" />
+  <project path="vendor/hardware_overlay" name="PeterGSI/android_vendor_hardware_overlay" remote="angry" revision="aosp17" />
   <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">
+  <project path="vendor/foss" name="PeterGSI/android_vendor_foss" remote="angry" revision="aosp17">
     <linkfile dest="update_foss.sh" src="update.sh" />
   </project>
+  <project path="vendor/interfaces" name="TrebleDroid/vendor_interfaces" remote="github" revision="android-16.0" />
+  <project path="vendor/prebuilts/titan2-touchpadd" name="PeterGSI/android_vendor_prebuilts_titan2-touchpadd" remote="angry" revision="main" />
+  <project path="external/google-fonts/google-sans-flex" name="PeterGSI/android_external_google-fonts_google-sans-flex" remote="angry" revision="aosp17" />
 
   <!-- Extra source-built apps -->
   <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" />
+  <project path="packages/apps/Dialer" name="LineageOS/android_packages_apps_Dialer" remote="github" revision="lineage-23.2" />
+  <project path="vendor/lineage-spn" name="PeterGSI/android_vendor_lineage-spn" remote="angry" revision="aosp17" />
 </manifest>
diff --git a/remove.xml b/remove.xml
index 34b0cfe..7fd9152 100644
--- a/remove.xml
+++ b/remove.xml
@@ -1,47 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remove-project path="device/google/akita" />
-  <remove-project path="device/google/akita-sepolicy" />
-  <remove-project path="device/google/akita-kernels/6.1" />
   <remove-project path="device/google/atv" />
-  <remove-project path="device/google/bluejay" />
-  <remove-project path="device/google/bluejay-sepolicy" />
-  <remove-project path="device/google/bluejay-kernels/6.1" />
   <remove-project path="device/google/contexthub" />
-  <remove-project path="device/google/caimito" />
-  <remove-project path="device/google/caimito-kernels/6.1" />
-  <remove-project path="device/google/caimito-sepolicy" />
-  <remove-project path="device/google/comet" />
-  <remove-project path="device/google/comet-kernels/6.1" />
-  <remove-project path="device/google/comet-sepolicy" />
   <remove-project path="device/google/common/etm" />
-  <remove-project path="device/google/felix" />
-  <remove-project path="device/google/felix-sepolicy" />
-  <remove-project path="device/google/felix-kernels/6.1" />
-  <remove-project path="device/google/gs101" />
-  <remove-project path="device/google/gs101-sepolicy" />
-  <remove-project path="device/google/gs201" />
-  <remove-project path="device/google/gs201-sepolicy" />
-  <remove-project path="device/google/gs-common" />
-  <remove-project path="device/google/lynx" />
-  <remove-project path="device/google/lynx-sepolicy" />
-  <remove-project path="device/google/lynx-kernels/6.1" />
-  <remove-project path="device/google/pantah" />
-  <remove-project path="device/google/pantah-sepolicy" />
-  <remove-project path="device/google/pantah-kernels/6.1" />
-  <remove-project path="device/google/raviole" />
-  <remove-project path="device/google/raviole-kernels/6.1" />
-  <remove-project path="device/google/tangorpro" />
-  <remove-project path="device/google/tangorpro-sepolicy" />
-  <remove-project path="device/google/tangorpro-kernels/6.1" />
-  <remove-project path="device/google/shusky" />
-  <remove-project path="device/google/shusky-kernels/6.1" />
-  <remove-project path="device/google/shusky-sepolicy" />
+  <remove-project path="device/google/sdv" />
+  <remove-project path="device/google/sdv_display_safety" />
   <remove-project path="device/google/trout" />
-  <remove-project path="device/google/zuma" />
-  <remove-project path="device/google/zuma-sepolicy" />
-  <remove-project path="device/google/zumapro" />
-  <remove-project path="device/google/zumapro-sepolicy" />
   <remove-project path="device/google_car" />
-  <remove-project path="prebuilts/android-emulator" />
 </manifest>