diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9d64a36..4467779 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -27,9 +27,9 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_panther.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_cloudripper-userdebug \
-    aosp_ravenclaw-userdebug \
-    aosp_cheetah-userdebug \
-    aosp_cheetah_hwasan-userdebug \
-    aosp_panther-userdebug \
-    aosp_panther_hwasan-userdebug
+    aosp_cloudripper-trunk_staging-userdebug \
+    aosp_ravenclaw-trunk_staging-userdebug \
+    aosp_cheetah-trunk_staging-userdebug \
+    aosp_cheetah_hwasan-trunk_staging-userdebug \
+    aosp_panther-trunk_staging-userdebug \
+    aosp_panther_hwasan-trunk_staging-userdebug