Remove Focal and Update Build version