Updated build template and spec