NDI-30: Added missing containers to template