Upgrade template

[reedsa]

What was wrong?

New template updates.

How was it fixed?

Todo:

• [X] Clean up commit history

• [X] Add or update documentation related to these changes

• [X] Add entry to the release notes

Cute Animal Picture

[fselmo]

Looks like this will need a merge commit rather than rebase