Go back to using ubuntu base image for now