Separate templates from containers