Adding the templates

Adding templates and fixing the yaml nonsense