Merge "Container yaml for 3.5.5"