Use smaller flavor also for Master