Merge "Use image name instead of the gerrit project name"