Build only develop and master updates.
Merge branch 'develop' into va/env-specific-configs