diff --git a/apply_patches.sh b/apply_patches.sh
index 82911f7..347e14d 100644
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -9,6 +9,7 @@ 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 cb04a44..5be79e8 100755
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@@ -62,15 +62,11 @@ prep_build() {
     mkdir -p ~/build-output
     echo ""
 
+    repopick -t 13-taro-kalama -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 340916 -r # SystemUI: add burnIn protection
-    repopick 342860 -r # codec2: Use numClientBuffers to control the pipeline
-    repopick 342861 -r # CCodec: Control the inputs to avoid pipeline overflow
-    repopick 342862 -r # [WA] Codec2: queue a empty work to HAL to wake up allocation thread
-    repopick 342863 -r # CCodec: Use pipelineRoom only for HW decoder
-    repopick 342864 -r # codec2: Change a Info print into Verbose
 }
 
 apply_patches() {
@@ -96,6 +92,14 @@ 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() {
@@ -115,7 +119,7 @@ build_treble() {
     esac
     lunch lineage_${TARGET}-userdebug
     make installclean
-    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-20.0-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${PERSONAL} && echo "-personal" || echo "").img
     #make vndk-test-sepolicy
 }
diff --git a/local_manifests_treble/manifest.xml b/local_manifests_treble/manifest.xml
index 2359711..9acb39b 100644
--- a/local_manifests_treble/manifest.xml
+++ b/local_manifests_treble/manifest.xml
@@ -6,6 +6,7 @@
   <project name="TrebleDroid/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-13.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" />
   <project name="AndyCGYan/android_packages_apps_QcRilAm" path="packages/apps/QcRilAm" remote="github" revision="master" />
   <remote name="gitlab" fetch="https://gitlab.com/" />
   <project name="MindTheGapps/vendor_gapps" path="vendor/gapps" remote="gitlab" revision="tau" />