Update the templates and the package to have more variety in configuration and test on multiple systems