Use a different criterion for staging build