Merge "Modified the Docker Tagging"