Upgrade build infra to be closer to Fedora's ?