diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index e7a87c1..4328459 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -10,6 +10,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_rpi4_tv.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_rpi4-userdebug \
-    aosp_rpi4_car-userdebug \
-    aosp_rpi4_tv-userdebug
+    aosp_rpi4-trunk_staging-userdebug \
+    aosp_rpi4_car-trunk_staging-userdebug \
+    aosp_rpi4_tv-trunk_staging-userdebug