diff --git a/apply_patches.sh b/apply_patches.sh
index 02395e8..347e14d 100644
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -8,6 +8,8 @@ shopt -s nullglob
 for project in $(cd $patches; echo *);do
 	p="$(tr _ / <<<$project |sed -e 's;platform/;;g')"
 	[ "$p" == build ] && p=build/make
+	[ "$p" == frameworks/proto/logging ] && p=frameworks/proto_logging
+	[ "$p" == treble/app ] && p=treble_app
 	[ "$p" == vendor/hardware/overlay ] && p=vendor/hardware_overlay
 	[ "$p" == vendor/partner/gms ] && p=vendor/partner_gms
 	pushd $p
diff --git a/buildbot_unified.sh b/buildbot_unified.sh
index 11cc28f..4009ebd 100755
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@@ -62,15 +62,14 @@ prep_build() {
     mkdir -p ~/build-output
     echo ""
 
-    repopick -Q "(status:open+AND+NOT+is:wip)+(label:Code-Review>=0+AND+label:Verified>=0)+project:LineageOS/android_packages_apps_Trebuchet+branch:lineage-19.1+NOT+332083"
-    repopick -t twelve-burnin
-    repopick 321337 -f # Deprioritize important developer notifications
-    repopick 321338 -f # Allow disabling important developer notifications
-    repopick 321339 -f # Allow disabling USB notifications
-    repopick 329229 -f # Alter model name to avoid SafetyNet HW attestation enforcement
-    repopick 329230 -f # keystore: Block key attestation for SafetyNet
-    repopick 331534 -f # SystemUI: Add support to add/remove QS tiles with one tap
-    repopick 331791 -f # Skip checking SystemUI's permission for observing sensor privacy
+    repopick -t twelve-burnin -r -f
+    repopick 321337 -r -f # Deprioritize important developer notifications
+    repopick 321338 -r -f # Allow disabling important developer notifications
+    repopick 321339 -r -f # Allow disabling USB notifications
+    repopick 329229 -r -f # Alter model name to avoid SafetyNet HW attestation enforcement
+    repopick 329230 -r -f # keystore: Block key attestation for SafetyNet
+    repopick 331534 -r -f # SystemUI: Add support to add/remove QS tiles with one tap
+    repopick 331791 -r -f # Skip checking SystemUI's permission for observing sensor privacy
 }
 
 apply_patches() {
@@ -96,13 +95,21 @@ finalize_treble() {
     git clean -fdx
     bash generate.sh lineage
     cd ../../..
+    cd treble_app
+    bash build.sh release
+    cp TrebleApp.apk ../vendor/hardware_overlay/TrebleApp/app.apk
+    cd ..
+    cd vendor/hardware_overlay
+    git add TrebleApp/app.apk
+    git commit -m "[TEMP] Up TrebleApp to $BUILD_DATE"
+    cd ../..
 }
 
 build_device() {
     if [ ${1} == "arm64" ]
     then
         lunch lineage_arm64-userdebug
-        make -j$(nproc --all) systemimage
+        make -j$(lscpu -b -p=Core,Socket | grep -v '^#' | sort -u | wc -l) systemimage
         mv $OUT/system.img ~/build-output/lineage-19.1-$BUILD_DATE-UNOFFICIAL-arm64$(${PERSONAL} && echo "-personal" || echo "").img
     else
         brunch ${1}
diff --git a/local_manifests_treble/manifest.xml b/local_manifests_treble/manifest.xml
index 4a85b65..80d783e 100644
--- a/local_manifests_treble/manifest.xml
+++ b/local_manifests_treble/manifest.xml
@@ -6,6 +6,7 @@
   <project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-11.0" />
   <project name="phhusson/vendor_lptools" path="vendor/lptools" remote="github" revision="master" />
   <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
+  <project name="TrebleDroid/treble_app" path="treble_app" remote="github" revision="master" />
   <remote name="gitlab" fetch="https://gitlab.com/" />
   <project name="davi.sh/gms-android-12" path="vendor/partner_gms" remote="gitlab" revision="master" />
 </manifest>