Refactor Heat template to use generic user