update template and fix secrets processing during user setup

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>