change base image; reorder build steps