Merge "Chore: Move to centos8-builder"