Update templates to include @git_home and @git_user variable in some missing locations

...