diff --git a/README.md b/README.md
index d654d91..b7dd681 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Clone both this and the patches repos:
 
 Finally, start the build script - for example, to build for all supported archs:
 
-    bash lineage_build_unified/buildbot_unified.sh treble 32B A64B 64B
+    bash lineage_build_unified/buildbot_unified.sh treble 32B 32BO A64B A64BG A64BO 64B 64BG
 
 Be sure to update the cloned repos from time to time!
 
diff --git a/buildbot_unified.sh b/buildbot_unified.sh
index 8e4a569..c8ca0c1 100755
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@@ -90,8 +90,12 @@ build_device() {
 build_treble() {
     case "${1}" in
         ("32B") TARGET=arm_bvS;;
+        ("32BO") TARGET=arm_boS;;
         ("A64B") TARGET=a64_bvS;;
+        ("A64BG") TARGET=a64_bgS;;
+        ("A64BO") TARGET=a64_boS;;
         ("64B") TARGET=arm64_bvS;;
+        ("64BG") TARGET=arm64_bgS;;
         (*) echo "Invalid target - exiting"; exit 1;;
     esac
     lunch lineage_${TARGET}-userdebug
diff --git a/local_manifests_treble/manifest.xml b/local_manifests_treble/manifest.xml
index 9135687..f142edb 100644
--- a/local_manifests_treble/manifest.xml
+++ b/local_manifests_treble/manifest.xml
@@ -5,4 +5,6 @@
   <project name="phhusson/vendor_vndk-tests" path="vendor/vndk-tests" remote="github" revision="master" />
   <project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-11.0" />
   <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
+  <remote name="gitlab" fetch="https://gitlab.com/" />
+  <project name="00p513-dev/partner_gms" path="vendor/partner_gms" remote="gitlab" revision="11" />
 </manifest>