Merge "container yaml for cps 3.4.9"