Use original docker_image save image name, but add tag support again