diff --git a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py
index 9edc5fcc..39e1f93c 100644
--- a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py
+++ b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py
@@ -237,11 +237,13 @@ async def get_cluster_summary(self) -> Dict[str, Any]:
 
         # use this for queries with no labels. turn ', cluster="xxx"' to 'cluster="xxx"'
         single_cluster_label = cluster_label.replace(",", "")
+
         memory_query = f"""
-            sum(max by (instance) (machine_memory_bytes{{ {single_cluster_label} }}))
+            sum(kube_node_status_capacity{{ resource='memory' {single_cluster_label} }})
         """
+
         cpu_query = f"""
-            sum(max by (instance) (machine_cpu_cores{{ {single_cluster_label} }}))
+            sum(kube_node_status_capacity{{ resource='cpu' {single_cluster_label} }})
         """
         kube_system_requests_mem = f"""
             sum(max(kube_pod_container_resource_requests{{ namespace='kube-system', resource='memory' {cluster_label} }})  by (job, pod, container) )