Update user template
Update role template
Update service-user template
Fix role template