Tweaks to dockerfiles