diff --git a/README.md b/README.md
index 3a08a66..6cbc720 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,14 @@ sudo pip3 install meson mako jinja2 ply pyyaml dataclasses
 3. Initialize repo:
 
 ```
-repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r34
+repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r50
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-14.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-14.0.0_r34 --depth=1
+repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r50 --depth=1
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-14.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-14.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-ap1a-userdebug
+lunch aosp_rpi4-ap2a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-ap1a-userdebug
+lunch aosp_rpi4_tv-ap2a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-ap1a-userdebug
+lunch aosp_rpi4_car-ap2a-userdebug
 ```
 ```
-lunch aosp_rpi5-ap1a-userdebug
+lunch aosp_rpi5-ap2a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-ap1a-userdebug
+lunch aosp_rpi5_tv-ap2a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-ap1a-userdebug
+lunch aosp_rpi5_car-ap2a-userdebug
 ```
 
 7. Compile:
diff --git a/manifest_brcm_rpi.xml b/manifest_brcm_rpi.xml
index 73569aa..8d47dd5 100644
--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -4,10 +4,10 @@
 
   <!-- Raspberry Pi -->
   <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-14.0" >
-    <linkfile dest="rpi4-mkimg.sh" src="mkimg.sh" />
+    <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-14.0" >
-    <linkfile dest="rpi5-mkimg.sh" src="mkimg.sh" />
+    <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-14.0" />
   <project path="device/brcm/rpi5-kernel" name="raspberry-vanilla/android_device_brcm_rpi5-kernel" remote="github" revision="android-14.0" />
@@ -21,16 +21,16 @@
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />
   <project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-14.0" >
-    <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk" />
-    <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default" />
-    <linkfile dest="build/core" src="core" />
-    <linkfile dest="build/envsetup.sh" src="envsetup.sh" />
-    <linkfile dest="build/target" src="target" />
-    <linkfile dest="build/tools" src="tools" />
+    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
+    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
+    <linkfile src="core" dest="build/core" />
+    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
+    <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-14.0" >
-    <linkfile dest="Android.bp" src="root.bp" />
-    <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
+    <linkfile src="bazel.WORKSPACE" dest="WORKSPACE" />
+    <linkfile src="bazel.BUILD" dest="BUILD" />
   </project>
 
   <!-- Camera -->
diff --git a/remove_projects.xml b/remove_projects.xml
index 292cbee..1f287ac 100644
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -1,5 +1,8 @@
 <?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-kernel" />
   <remove-project name="device/amlogic/yukawa" />
   <remove-project name="device/amlogic/yukawa-kernel" />
   <remove-project name="device/google/barbet" />
@@ -78,7 +81,6 @@
   <remove-project name="platform/hardware/qcom/sm8150/vr" />
   <remove-project name="platform/hardware/qcom/sm8150p/gps" />
   <remove-project name="platform/hardware/qcom/wlan" />
-  <remove-project name="platform/hardware/st/nfc" />
   <remove-project name="platform/hardware/st/secure_element" />
   <remove-project name="platform/hardware/st/secure_element2" />
   <remove-project name="platform/hardware/samsung/nfc" />