Merge "Update the docker manifest for SO"