Update templates to Icehouse