use common builder, stop relying on branches from git flow