Various tweaks and use docker instead of docker.io