@AviBueno, please remove it from the template and make sure it's added to our SaaS config, it probably won't be needed in most non-saas environments.