[OS-BUILD PATCHv13 7/11] Simplify job templates