Merge "server add container.yaml"