diff --git a/README.md b/README.md
index f56efaf..92b443a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-### Device specific configuration to build AOSP Android 15 for Raspberry Pi 4 and Raspberry Pi 5.
+### Device specific configuration to build AOSP Android 16 for Raspberry Pi 4 and Raspberry Pi 5.
 
 ***
 
@@ -16,16 +16,16 @@ 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_r32
-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
+repo init -u https://android.googlesource.com/platform/manifest -b android-16.0.0_r1
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-16.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_r32 --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
+repo init -u https://android.googlesource.com/platform/manifest -b android-16.0.0_r1 --depth=1
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-16.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-16.0/remove_projects.xml
 ```
 
 4. Sync source code:
@@ -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-bp1a-userdebug
+lunch aosp_rpi4-bp2a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-bp1a-userdebug
+lunch aosp_rpi4_tv-bp2a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-bp1a-userdebug
+lunch aosp_rpi4_car-bp2a-userdebug
 ```
 ```
-lunch aosp_rpi5-bp1a-userdebug
+lunch aosp_rpi5-bp2a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-bp1a-userdebug
+lunch aosp_rpi5_tv-bp2a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-bp1a-userdebug
+lunch aosp_rpi5_car-bp2a-userdebug
 ```
 
 7. Compile:
@@ -76,7 +76,7 @@ make bootimage systemimage vendorimage -j$(nproc)
 ./rpi5-mkimg.sh
 ```
 
-Also look into [Linux kernel build instructions](https://github.com/raspberry-vanilla/android_kernel_manifest/tree/android-15.0).
+Also look into [Linux kernel build instructions](https://github.com/raspberry-vanilla/android_kernel_manifest/tree/android-16.0).
 
 ***
 
diff --git a/manifest_brcm_rpi.xml b/manifest_brcm_rpi.xml
index d40d504..baec8dc 100644
--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -3,26 +3,26 @@
   <remote name="github" fetch="https://github.com/" />
 
   <!-- Raspberry Pi -->
-  <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-15.0" >
+  <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-16.0" >
     <linkfile src="mkimg.sh" dest="rpi4-mkimg.sh" />
     <linkfile src="wrimg.sh" dest="rpi4-wrimg.sh" />
   </project>
-  <project path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-15.0" >
+  <project path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-16.0" >
     <linkfile src="mkimg.sh" dest="rpi5-mkimg.sh" />
     <linkfile src="wrimg.sh" dest="rpi5-wrimg.sh" />
   </project>
-  <project path="device/brcm/rpi4-kernel" name="raspberry-vanilla/android_device_brcm_rpi4-kernel" remote="github" revision="android-15.0" />
-  <project path="device/brcm/rpi5-kernel" name="raspberry-vanilla/android_device_brcm_rpi5-kernel" remote="github" revision="android-15.0" />
-  <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-15.0" />
+  <project path="device/brcm/rpi4-kernel" name="raspberry-vanilla/android_device_brcm_rpi4-kernel" remote="github" revision="android-16.0" />
+  <project path="device/brcm/rpi5-kernel" name="raspberry-vanilla/android_device_brcm_rpi5-kernel" remote="github" revision="android-16.0" />
+  <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-16.0" />
 
   <!-- Audio -->
-  <project path="external/alsa-lib" name="raspberry-vanilla/android_external_alsa-lib" remote="github" revision="android-15.0" />
-  <project path="external/alsa-utils" name="raspberry-vanilla/android_external_alsa-utils" remote="github" revision="android-15.0" />
+  <project path="external/alsa-lib" name="raspberry-vanilla/android_external_alsa-lib" remote="github" revision="android-16.0" />
+  <project path="external/alsa-utils" name="raspberry-vanilla/android_external_alsa-utils" remote="github" revision="android-16.0" />
 
   <!-- Build -->
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />
-  <project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-15.0" >
+  <project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-16.0" >
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
     <linkfile src="core" dest="build/core" />
@@ -30,37 +30,36 @@
     <linkfile src="target" dest="build/target" />
     <linkfile src="tools" dest="build/tools" />
   </project>
-  <project path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-15.0" >
+  <project path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-16.0" >
     <linkfile src="root.bp" dest="Android.bp" />
     <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
   </project>
 
   <!-- Camera -->
-  <project path="external/libcamera" name="raspberry-vanilla/android_external_libcamera" remote="github" revision="android-15.0" />
-  <project path="external/libpisp" name="raspberry-vanilla/android_external_libpisp" remote="github" revision="android-15.0" />
-  <project path="external/libyaml" name="raspberry-vanilla/android_external_libyaml" remote="github" revision="android-15.0" />
-  <project path="external/libyuv_chromium" name="raspberry-vanilla/android_external_libyuv_chromium" remote="github" revision="android-15.0" />
+  <project path="external/libcamera" name="raspberry-vanilla/android_external_libcamera" remote="github" revision="android-16.0" />
+  <project path="external/libpisp" name="raspberry-vanilla/android_external_libpisp" remote="github" revision="android-16.0" />
+  <project path="external/libyaml" name="raspberry-vanilla/android_external_libyaml" remote="github" revision="android-16.0" />
+  <project path="external/libyuv_chromium" name="raspberry-vanilla/android_external_libyuv_chromium" remote="github" revision="android-16.0" />
 
   <!-- FFmpeg -->
-  <project path="external/ffmpeg" name="raspberry-vanilla/android_external_ffmpeg" remote="github" revision="android-15.0" />
-  <project path="external/ffmpeg_codec2" name="raspberry-vanilla/android_external_ffmpeg_codec2" remote="github" revision="android-15.0" />
-  <project path="external/libudev-zero" name="raspberry-vanilla/android_external_libudev-zero" remote="github" revision="android-15.0" />
+  <project path="external/ffmpeg" name="raspberry-vanilla/android_external_ffmpeg" remote="github" revision="android-16.0" />
+  <project path="external/ffmpeg_codec2" name="raspberry-vanilla/android_external_ffmpeg_codec2" remote="github" revision="android-16.0" />
+  <project path="external/libudev-zero" name="raspberry-vanilla/android_external_libudev-zero" remote="github" revision="android-16.0" />
 
   <!-- Graphics -->
   <remove-project name="platform/external/drm_hwcomposer" />
   <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/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" />
+  <project path="external/drm_hwcomposer" name="raspberry-vanilla/android_external_drm_hwcomposer" remote="github" revision="android-16.0" />
+  <project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-16.0" />
+  <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-16.0" />
 
   <!-- v4l2_codec2 -->
   <remove-project name="platform/external/v4l2_codec2" />
-  <project path="external/v4l2_codec2" name="raspberry-vanilla/android_external_v4l2_codec2" remote="github" revision="android-15.0" />
+  <project path="external/v4l2_codec2" name="raspberry-vanilla/android_external_v4l2_codec2" remote="github" revision="android-16.0" />
 
   <!-- Wifi -->
   <remove-project name="platform/packages/modules/Wifi" />
-  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-15.0" />
+  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-16.0" />
 
 </manifest>
diff --git a/manifest_utilities.xml b/manifest_utilities.xml
index 0e72c38..1d45e00 100644
--- a/manifest_utilities.xml
+++ b/manifest_utilities.xml
@@ -2,8 +2,11 @@
 <manifest>
   <remote name="github" fetch="https://github.com/" />
 
-  <!-- Utilities -->
-  <project path="external/raspberrypi-utils" name="raspberry-vanilla/android_external_raspberrypi-utils" remote="github" revision="android-15.0" />
-  <project path="external/v4l-utils" name="raspberry-vanilla/android_external_v4l-utils" remote="github" revision="android-15.0" />
+  <!-- Raspberry Pi utils -->
+  <project path="external/raspberrypi-utils" name="raspberry-vanilla/android_external_raspberrypi-utils" remote="github" revision="android-16.0" />
+
+  <!-- V4L utils -->
+  <remove-project name="platform/external/v4l-utils" />
+  <project path="external/v4l-utils" name="raspberry-vanilla/android_external_v4l-utils" remote="github" revision="android-16.0" />
 
 </manifest>
diff --git a/remove_projects.xml b/remove_projects.xml
index 3bc0e8e..eb2281d 100644
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -1,54 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remove-project name="device/google/akita" />
-  <remove-project name="device/google/akita-sepolicy" />
-  <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/6.1" />
-  <remove-project name="device/google/caimito" />
-  <remove-project name="device/google/caimito-kernels/6.1" />
-  <remove-project name="device/google/caimito-sepolicy" />
-  <remove-project name="device/google/comet" />
-  <remove-project name="device/google/comet-kernels/6.1" />
-  <remove-project name="device/google/comet-sepolicy" />
   <remove-project name="device/google/common/etm" />
   <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/6.1" />
-  <remove-project name="device/google/gs101" />
-  <remove-project name="device/google/gs101-sepolicy" />
-  <remove-project name="device/google/gs201" />
-  <remove-project name="device/google/gs201-sepolicy" />
-  <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/6.1" />
-  <remove-project name="device/google/pantah" />
-  <remove-project name="device/google/pantah-sepolicy" />
-  <remove-project name="device/google/pantah-kernels/6.1" />
-  <remove-project name="device/google/raviole" />
-  <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/6.1" />
-  <remove-project name="device/google/shusky" />
-  <remove-project name="device/google/shusky-sepolicy" />
-  <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" />
-  <remove-project name="device/google/zumapro" />
-  <remove-project name="device/google/zumapro-sepolicy" />
   <remove-project name="device/linaro/dragonboard" />
   <remove-project name="device/linaro/dragonboard-kernel" />
   <remove-project name="device/linaro/hikey" />
   <remove-project name="device/linaro/hikey-kernel" />
-  <remove-project name="device/linaro/poplar" />
-  <remove-project name="device/linaro/poplar-kernel" />
   <remove-project name="platform/hardware/invensense" />
   <remove-project name="platform/hardware/nxp/keymint" />
   <remove-project name="platform/hardware/nxp/nfc" />