Fix issue with template rendering
Remove domain and improve default values