correct the docker image selection logic
Merge branch 'master' into hh-build-api