Merge "Fix docker image tags"