Use regexes that work for trunk builds