diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c2c8efe..ce06e54 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -39,7 +39,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_whitefin.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_slider-userdebug \
-    aosp_whitefin-userdebug \
-    aosp_oriole-userdebug \
-    aosp_raven-userdebug
+    aosp_slider-trunk_staging-userdebug \
+    aosp_whitefin-trunk_staging-userdebug \
+    aosp_oriole-trunk_staging-userdebug \
+    aosp_raven-trunk_staging-userdebug