diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 33b2644..52e1db7 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -21,8 +21,8 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/redroid_arm64_only.mk \
 
 COMMON_LUNCH_CHOICES := \
-    redroid_x86_64-trunk_staging-userdebug \
-    redroid_x86_64_only-trunk_staging-userdebug \
-    redroid_arm64-trunk_staging-userdebug \
-    redroid_arm64_only-trunk_staging-userdebug \
+    redroid_x86_64-bp2a-userdebug \
+    redroid_x86_64_only-bp2a-userdebug \
+    redroid_arm64-bp2a-userdebug \
+    redroid_arm64_only-bp2a-userdebug \