Fix config handling

Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: samalba)

Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: dmp42)