Update templates variable scope (use @)

Update scope