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 51a8821..a21220c 100755
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@@ -59,6 +59,7 @@ prep_build() {
 
     echo "Setting up build environment"
     source build/envsetup.sh &> /dev/null
+    source vendor/lineage/vars/aosp_target_release
     mkdir -p ~/build-output
     echo ""
 
@@ -102,7 +103,7 @@ build_treble() {
         ("64GN") TARGET=gsi_arm64_gN;;
         (*) echo "Invalid target - exiting"; exit 1;;
     esac
-    lunch lineage_${TARGET}-userdebug
+    lunch lineage_${TARGET}-${aosp_target_release}-userdebug
     make installclean
     make -j$(lscpu -b -p=Core,Socket | grep -v '^#' | sort -u | wc -l) systemimage
     mv $OUT/system.img ~/build-output/lineage-21.0-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${PERSONAL} && echo "-personal" || echo "").img
@@ -114,6 +115,7 @@ then
     echo ""
     echo "Setting up build environment"
     source build/envsetup.sh &> /dev/null
+    source vendor/lineage/vars/aosp_target_release
     echo ""
 else
     prep_build
diff --git a/make_clobber.sh b/make_clobber.sh
new file mode 100755
index 0000000..0593558
--- /dev/null
+++ b/make_clobber.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source build/envsetup.sh
+source vendor/lineage/vars/aosp_target_release
+lunch lineage_gsi_arm64-$aosp_target_release-userdebug
+make clobber