Merge "Harmonize docker image names"