Fixed to support the service container, not just the CLI App template.