Merge "Use certificate build target" into main