diff --git a/build/envsetup.sh b/build/envsetup.sh
index 37051e1..958ce30 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -27,7 +27,8 @@
 function breakfast()
 {
     target=$1
-    local variant=$2
+    local release=$2
+    local variant=$3
 
     if [ $# -eq 0 ]; then
         # No arguments, so let's have the full menu
@@ -42,7 +43,7 @@
             if [ -z "$variant" ]; then
                 variant="user"
             fi
-            lunch omni_$target-$variant
+            lunch omni_$target-$release-$variant
         fi
     fi
     return $?