switch to using common base image