[DO NOT MERGE] Minor updates

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