Modified infrastructure script - change Template to template