updating to remove preinstall, do work with newer base images, make resulting image smaller
merging