Update templates to use standard where possible

Move servers to using the standard template where possible with a view
to reducing the number of templates. In some cases the old template
selection was incorrect.