WIP: Addressing Docker review comments