NX-359 | Finish Template Config