more monkey-patching to service template (todo: file bug to capture issues)