Merge "Fix the docker image name"