Updates templates to include all template variables

[#80168328]