fix base image and don't clean up