PIM-3196 Update the templates