diff --git a/README.md b/README.md
index 010d2a8..3b33fb2 100644
--- a/README.md
+++ b/README.md
@@ -17,15 +17,15 @@ sudo pip3 install meson mako jinja2 ply pyyaml dataclasses
 
 ```
 repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r4
-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/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0.0_r4/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_r4 --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
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0.0_r4/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.0_r4/remove_projects.xml
 ```
 
 4. Sync source code:
diff --git a/manifest_brcm_rpi.xml b/manifest_brcm_rpi.xml
index 5ecd8b9..02e65e3 100644
--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -3,10 +3,10 @@
   <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-15.0.0_r4" >
     <linkfile src="mkimg.sh" dest="rpi4-mkimg.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-15.0.0_r4" >
     <linkfile src="mkimg.sh" dest="rpi5-mkimg.sh" />
   </project>
   <project path="device/brcm/rpi4-kernel" name="raspberry-vanilla/android_device_brcm_rpi4-kernel" remote="github" revision="android-15.0" />
@@ -20,7 +20,7 @@
   <!-- 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-15.0.0_r4" >
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
     <linkfile src="core" dest="build/core" />
@@ -28,7 +28,7 @@
     <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-15.0.0_r4" >
     <linkfile src="root.bp" dest="Android.bp" />
     <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
   </project>
@@ -52,9 +52,9 @@
   <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/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" />
+  <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-15.0.0_r4" />
+  <project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-14.0" />
+  <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-15.0.0_r4" />
 
   <!-- v4l2_codec2 -->
   <remove-project name="platform/external/v4l2_codec2" />
@@ -63,7 +63,7 @@
   <!-- Wifi -->
   <remove-project name="platform/external/wpa_supplicant_8" />
   <remove-project name="platform/packages/modules/Wifi" />
-  <project path="external/wpa_supplicant_8" name="raspberry-vanilla/android_external_wpa_supplicant_8" remote="github" revision="android-15.0" />
-  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-15.0" />
+  <project path="external/wpa_supplicant_8" name="raspberry-vanilla/android_external_wpa_supplicant_8" remote="github" revision="android-15.0.0_r4" />
+  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-15.0.0_r4" />
 
 </manifest>