Merge "Add container yaml for 3.3.1"