Remove scm from base image
Add generic image