Merge "Change docker image name"