Fully migrate build stages again

Closes #38756

See merge request gitlab-org/gitlab-ce!15741