Minor updates

Do not merge until:
- [x] verify that containerized version of `docker-builder` still works without docker client installed