diff --git a/holmes/plugins/toolsets/elasticsearch/elasticsearch.py b/holmes/plugins/toolsets/elasticsearch/elasticsearch.py
index f1f2c00cc5..8e4b93fab2 100644
--- a/holmes/plugins/toolsets/elasticsearch/elasticsearch.py
+++ b/holmes/plugins/toolsets/elasticsearch/elasticsearch.py
@@ -125,7 +125,8 @@ def __init__(self, name: str, description: str, tools: list, **kwargs):
     def prerequisites_callable(self, config: Dict[str, Any]) -> Tuple[bool, str]:
         """Check if the Elasticsearch configuration is valid and the cluster is reachable."""
         try:
-            self.config = ElasticsearchConfig(**config)
+            config_class = self.config_classes[0] if self.config_classes else ElasticsearchConfig
+            self.config = config_class(**config)
             return self._perform_health_check()
         except Exception as e:
             return False, f"Failed to validate Elasticsearch configuration: {str(e)}"
diff --git a/holmes/plugins/toolsets/grafana/toolset_grafana.py b/holmes/plugins/toolsets/grafana/toolset_grafana.py
index ab06f822d4..677c91221a 100644
--- a/holmes/plugins/toolsets/grafana/toolset_grafana.py
+++ b/holmes/plugins/toolsets/grafana/toolset_grafana.py
@@ -48,7 +48,7 @@ def _build_grafana_dashboard_url(
 
 
 class GrafanaToolset(BaseGrafanaToolset):
-    config_class: ClassVar[Type[GrafanaDashboardConfig]] = GrafanaDashboardConfig
+    config_classes: ClassVar[list[Type[GrafanaDashboardConfig]]] = [GrafanaDashboardConfig]
 
     def __init__(self):
         super().__init__(