diff --git a/README.md b/README.md
index f57836c..23000b3 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,14 @@ sudo pip3 install dataclasses jinja2 mako meson ply pyyaml
 3. Initialize repo:
 
 ```
-repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r14
+repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r20
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/manifest_brcm_rpi.xml --create-dirs
 ```
 
 Or optionally, you can reduce download size by creating a shallow clone and removing unneeded projects:
 
 ```
-repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r14 --depth=1
+repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r20 --depth=1
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/manifest_brcm_rpi.xml --create-dirs
 curl -o .repo/local_manifests/remove_projects.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/remove_projects.xml
 ```
@@ -43,22 +43,22 @@ repo sync
 6. Select the device (`rpi4` or `rpi5`) and build target (tablet UI, `tv` for Android TV, or `car` for Android Automotive):
 
 ```
-lunch aosp_rpi4-ap4a-userdebug
+lunch aosp_rpi4-bp1a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-ap4a-userdebug
+lunch aosp_rpi4_tv-bp1a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-ap4a-userdebug
+lunch aosp_rpi4_car-bp1a-userdebug
 ```
 ```
-lunch aosp_rpi5-ap4a-userdebug
+lunch aosp_rpi5-bp1a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-ap4a-userdebug
+lunch aosp_rpi5_tv-bp1a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-ap4a-userdebug
+lunch aosp_rpi5_car-bp1a-userdebug
 ```
 
 7. Compile:
diff --git a/manifest_brcm_rpi.xml b/manifest_brcm_rpi.xml
index 0a1c5d1..428295d 100644
--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -48,12 +48,10 @@
 
   <!-- Graphics -->
   <remove-project name="platform/external/drm_hwcomposer" />
-  <remove-project name="platform/external/libdrm" />
   <remove-project name="platform/external/mesa3d" />
   <remove-project name="platform/external/minigbm" />
   <project path="external/drm_hwcomposer" name="raspberry-vanilla/android_external_drm_hwcomposer" remote="github" revision="android-15.0" />
   <project path="external/libdisplay-info" name="platform/external/libdisplay-info" remote="aosp" revision="26677e2a01d937c837cb1789a776463ed18263ac" />
-  <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-15.0" />
   <project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-15.0" />
   <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-15.0" />
 
diff --git a/remove_projects.xml b/remove_projects.xml
index 123501f..3bc0e8e 100644
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -2,12 +2,12 @@
 <manifest>
   <remove-project name="device/google/akita" />
   <remove-project name="device/google/akita-sepolicy" />
-  <remove-project name="device/google/akita-kernels/5.15" />
+  <remove-project name="device/google/akita-kernels/6.1" />
   <remove-project name="device/amlogic/yukawa" />
   <remove-project name="device/amlogic/yukawa-kernel" />
   <remove-project name="device/google/bluejay" />
   <remove-project name="device/google/bluejay-sepolicy" />
-  <remove-project name="device/google/bluejay-kernels/5.10" />
+  <remove-project name="device/google/bluejay-kernels/6.1" />
   <remove-project name="device/google/caimito" />
   <remove-project name="device/google/caimito-kernels/6.1" />
   <remove-project name="device/google/caimito-sepolicy" />
@@ -18,7 +18,7 @@
   <remove-project name="device/google/contexthub" />
   <remove-project name="device/google/felix" />
   <remove-project name="device/google/felix-sepolicy" />
-  <remove-project name="device/google/felix-kernels/5.10" />
+  <remove-project name="device/google/felix-kernels/6.1" />
   <remove-project name="device/google/gs101" />
   <remove-project name="device/google/gs101-sepolicy" />
   <remove-project name="device/google/gs201" />
@@ -26,18 +26,18 @@
   <remove-project name="device/google/gs-common" />
   <remove-project name="device/google/lynx" />
   <remove-project name="device/google/lynx-sepolicy" />
-  <remove-project name="device/google/lynx-kernels/5.10" />
+  <remove-project name="device/google/lynx-kernels/6.1" />
   <remove-project name="device/google/pantah" />
   <remove-project name="device/google/pantah-sepolicy" />
-  <remove-project name="device/google/pantah-kernels/5.10" />
+  <remove-project name="device/google/pantah-kernels/6.1" />
   <remove-project name="device/google/raviole" />
-  <remove-project name="device/google/raviole-kernels/5.10" />
+  <remove-project name="device/google/raviole-kernels/6.1" />
   <remove-project name="device/google/tangorpro" />
   <remove-project name="device/google/tangorpro-sepolicy" />
-  <remove-project name="device/google/tangorpro-kernels/5.10" />
+  <remove-project name="device/google/tangorpro-kernels/6.1" />
   <remove-project name="device/google/shusky" />
   <remove-project name="device/google/shusky-sepolicy" />
-  <remove-project name="device/google/shusky-kernels/5.15" />
+  <remove-project name="device/google/shusky-kernels/6.1" />
   <remove-project name="device/google/trout" />
   <remove-project name="device/google/zuma" />
   <remove-project name="device/google/zuma-sepolicy" />