diff --git a/apply_patches.sh b/apply_patches.sh
index 8cd1d20..02395e8 100644
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -8,6 +8,7 @@ shopt -s nullglob
 for project in $(cd $patches; echo *);do
 	p="$(tr _ / <<<$project |sed -e 's;platform/;;g')"
 	[ "$p" == build ] && p=build/make
+	[ "$p" == vendor/hardware/overlay ] && p=vendor/hardware_overlay
 	[ "$p" == vendor/partner/gms ] && p=vendor/partner_gms
 	pushd $p
 	git clean -fdx; git reset --hard
diff --git a/buildbot_unified.sh b/buildbot_unified.sh
index 7434cab..57fb4b3 100755
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@@ -64,10 +64,11 @@ prep_build() {
 
     repopick -Q "status:open+project:LineageOS/android_packages_apps_Trebuchet+branch:lineage-19.1"
     repopick -t twelve-burnin
-    repopick -t twelve-fingerprint
     repopick 321337 # Deprioritize important developer notifications
     repopick 321338 # Allow disabling important developer notifications
     repopick 321339 # Allow disabling USB notifications
+    repopick 326712 # overlay: show all icons in collapsed statusbar
+    repopick 327113 # Keystore 2.0: Add CREATION_DATETIME only for Keymint V1 and higher.
 }
 
 apply_patches() {
diff --git a/local_manifests_treble/manifest.xml b/local_manifests_treble/manifest.xml
index 86b0a9b..4a85b65 100644
--- a/local_manifests_treble/manifest.xml
+++ b/local_manifests_treble/manifest.xml
@@ -8,6 +8,4 @@
   <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
   <remote name="gitlab" fetch="https://gitlab.com/" />
   <project name="davi.sh/gms-android-12" path="vendor/partner_gms" remote="gitlab" revision="master" />
-  <remove-project name="platform/packages/apps/Gallery2" />
-  <project name="LineageOS/android_packages_apps_Gallery2" path="packages/apps/Gallery2" remote="github" revision="lineage-18.1" />
 </manifest>