diff --git a/README.md b/README.md
index 1e1ed05..acc6229 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-### Device specific configuration to build AOSP Android 16 (android-16.0.0_r3) for Raspberry Pi 4 and Raspberry Pi 5.
+### Device specific configuration to build AOSP Android 16 (android-16.0.0_r4) for Raspberry Pi 4 and Raspberry Pi 5.
 Based on [RaspberryVanilla](https://github.com/raspberry-vanilla).
 
 ***
@@ -16,7 +16,7 @@ sudo apt-get install dosfstools e2fsprogs gdisk kpartx mtools rsync
 3. Initialize repo:
 
 ```
-repo init -u https://android.googlesource.com/platform/manifest -b android-16.0.0_r3
+repo init -u https://android.googlesource.com/platform/manifest -b android-16.0.0_r4
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://git.oxmc.me/PawletOS/android_local_manifest/raw/branch/android-16.0/vendors/brcm_rpi.xml --create-dirs
 curl -o .repo/local_manifests/manifest_lineageos.xml -L https://git.oxmc.me/PawletOS/android_local_manifest/raw/branch/android-16.0/vendors/lineageos.xml --create-dirs
 curl -o .repo/local_manifests/manifest_pawletos.xml -L https://git.oxmc.me/PawletOS/android_local_manifest/raw/branch/android-16.0/pawletos.xml --create-dirs
@@ -25,7 +25,7 @@ curl -o .repo/local_manifests/manifest_pawletos.xml -L https://git.oxmc.me/Pawle
 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-16.0.0_r3 --depth=1
+repo init -u https://android.googlesource.com/platform/manifest -b android-16.0.0_r4 --depth=1
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://git.oxmc.me/PawletOS/android_local_manifest/raw/branch/android-16.0/vendors/brcm_rpi.xml --create-dirs
 curl -o .repo/local_manifests/manifest_lineageos.xml -L https://git.oxmc.me/PawletOS/android_local_manifest/raw/branch/android-16.0/vendors/lineageos.xml --create-dirs
 curl -o .repo/local_manifests/manifest_pawletos.xml -L https://git.oxmc.me/PawletOS/android_local_manifest/raw/branch/android-16.0/pawletos.xml --create-dirs
@@ -47,34 +47,34 @@ repo sync
 6. Select the device (`rpi4` or `rpi5`) and build target (normal, `tablet` for tablet, `tv` for Android TV, or `car` for Android Automotive):
 
 ```
-lunch pawlet_rpi4-bp3a-userdebug
+lunch pawlet_rpi4-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi4_tablet-bp3a-userdebug
+lunch pawlet_rpi4_tablet-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi4_tv-bp3a-userdebug
+lunch pawlet_rpi4_tv-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi4_car-bp3a-userdebug
+lunch pawlet_rpi4_car-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi5-bp3a-userdebug
+lunch pawlet_rpi5-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi5_tablet-bp3a-userdebug
+lunch pawlet_rpi5_tablet-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi5_tv-bp3a-userdebug
+lunch pawlet_rpi5_tv-bp4a-userdebug
 ```
 ```
-lunch pawlet_rpi5_car-bp3a-userdebug
+lunch pawlet_rpi5_car-bp4a-userdebug
 ```
 
 7. Compile:
 
 ```
-make bootimage systemimage systemextimage vendorimage -j$(nproc)
+make bootimage systemimage systemextimage vendorimage productimage -j$(nproc)
 ```
 
 8. Make flashable image for the device (`rpi4` or `rpi5`):
diff --git a/pawletos.xml b/pawletos.xml
index 16a4ef7..59700d6 100644
--- a/pawletos.xml
+++ b/pawletos.xml
@@ -22,6 +22,16 @@
   <project path="vendor/pawlet/twrp_recovery" name="PawletOS/twrp_recovery" remote="oxmc_git" revision="android-16" />
   <project path="vendor/twrp" name="PawletOS/android_vendor_twrp" remote="oxmc_git" revision="android-14.1" />
 
+  <!-- Vendor (HALs, system apps, etc.) -->
+  <project path="vendor/pawlet" name="PawletOS/vendor_pawlet" remote="oxmc_git" revision="main" />
+
+  <!-- Patches (applied post-sync by PawletOS-Build/environ.py) -->
+  <project path="vendor/pawlet/patches" name="PawletOS/patches" remote="oxmc_git" revision="main" />
+
+  <!-- update_engine: use LineageOS fork for improved OTA compatibility -->
+  <remove-project name="platform/system/update_engine" />
+  <project path="system/update_engine" name="LineageOS/android_system_update_engine" remote="github" revision="lineage-22.2" />
+
   <!-- First party apps -->
   <project path="packages/apps/ConfigProvisioner" name="PawletOS/app_ConfigProvisioner" remote="oxmc_git" revision="main" />