diff --git a/buildbot_unified.sh b/buildbot_unified.sh
index d58a07d..68aa7b2 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() {