Tweaks to Dockerfile and cloud-config