diff --git a/assets/ingress-performance-ocp/queries.libsonnet b/assets/ingress-performance-ocp/queries.libsonnet
index b7b0d2f..00da290 100644
--- a/assets/ingress-performance-ocp/queries.libsonnet
+++ b/assets/ingress-performance-ocp/queries.libsonnet
@@ -232,6 +232,70 @@ local elasticsearch = g.query.elasticsearch;
 
     },
 
+    HAProxyAvgCPUUsage: {
+        query():
+            elasticsearch.withAlias("")
+            + elasticsearch.withHide(false)
+            + elasticsearch.withBucketAggs([
+                elasticsearch.bucketAggs.Terms.withField("$compare_by")
+                + elasticsearch.bucketAggs.Terms.withId("7")
+                + elasticsearch.bucketAggs.Terms.withType('terms')
+                + elasticsearch.bucketAggs.Terms.settings.withOrder('desc')
+                + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term')
+                + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1')
+                + elasticsearch.bucketAggs.Terms.settings.withSize("0"),
+                elasticsearch.bucketAggs.DateHistogram.withField("timestamp")
+                + elasticsearch.bucketAggs.DateHistogram.withId("8")
+                + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram')
+                + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto')
+                + elasticsearch.bucketAggs.DateHistogram.settings.withMinDocCount("0")
+                + elasticsearch.bucketAggs.DateHistogram.settings.withTimeZone("utc")
+                + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges("0"),
+
+            ])
+            + elasticsearch.withMetrics([
+            elasticsearch.metrics.MetricAggregationWithSettings.Average.withField("infra_metrics.avg_cpu_usage_router_pods")
+            + elasticsearch.metrics.MetricAggregationWithSettings.Average.withId("1")
+            + elasticsearch.metrics.MetricAggregationWithSettings.Average.withType('avg')
+            + elasticsearch.metrics.MetricAggregationWithSettings.Average.settings.withScript('_value*100')
+            ])
+            + elasticsearch.withQuery("uuid.keyword: $uuid AND config.termination.keyword: $termination")
+            + elasticsearch.withTimeField('timestamp')
+
+    },
+
+    InfraNodesCPUUsageEdge: {
+        query():
+            elasticsearch.withAlias("")
+            + elasticsearch.withHide(false)
+            + elasticsearch.withBucketAggs([
+                elasticsearch.bucketAggs.Terms.withField("$compare_by")
+                + elasticsearch.bucketAggs.Terms.withId("7")
+                + elasticsearch.bucketAggs.Terms.withType('terms')
+                + elasticsearch.bucketAggs.Terms.settings.withOrder('desc')
+                + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term')
+                + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1')
+                + elasticsearch.bucketAggs.Terms.settings.withSize("0"),
+                elasticsearch.bucketAggs.DateHistogram.withField("timestamp")
+                + elasticsearch.bucketAggs.DateHistogram.withId("8")
+                + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram')
+                + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto')
+                + elasticsearch.bucketAggs.DateHistogram.settings.withMinDocCount("0")
+                + elasticsearch.bucketAggs.DateHistogram.settings.withTimeZone("utc")
+                + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges("0"),
+
+            ])
+            + elasticsearch.withMetrics([
+            elasticsearch.metrics.MetricAggregationWithSettings.Average.withField("infra_metrics.avg_cpu_usage_router_nodes")
+            + elasticsearch.metrics.MetricAggregationWithSettings.Average.withId("1")
+            + elasticsearch.metrics.MetricAggregationWithSettings.Average.withType('avg')
+            + elasticsearch.metrics.MetricAggregationWithSettings.Average.settings.withScript('_value*100')
+            ])
+            + elasticsearch.withQuery("uuid.keyword: $uuid AND config.termination.keyword: $termination")
+            + elasticsearch.withTimeField('timestamp')
+
+    },
+
     qualityRPS: {
         query():
             elasticsearch.withAlias("")
diff --git a/templates/CPT/ingress-perf-v2.jsonnet b/templates/CPT/ingress-perf-v2.jsonnet
index 5c73027..5223ebc 100644
--- a/templates/CPT/ingress-perf-v2.jsonnet
+++ b/templates/CPT/ingress-perf-v2.jsonnet
@@ -54,9 +54,12 @@ g.dashboard.new('Ingress-perf')
     panels.timeSeries.withMeanReq('$latency_metric trend', 'µs', queries.latencyTrend.query(), { x: 12, y: 15, w: 12, h: 8 }),
     panels.bargauge.withAvgTimeThresholds('RPS $termination', 'reqps', queries.terminationRPS.query(), { x: 0, y: 23, w: 12, h: 7 }),
     panels.bargauge.withAvgTimeThresholds('$latency_metric $termination', 'µs', queries.latencyTermination.query(), { x: 12, y: 23, w: 12, h: 7 }),
+    panels.bargauge.withAvgTimeThresholds('HAProxy avg CPU usage $termination', 'percent', queries.HAProxyAvgCPUUsage.query(), { x: 0, y: 30, w: 12, h: 7 }),
+    panels.bargauge.withAvgTimeThresholds('Infra nodes CPU usage $termination', 'percent', queries.InfraNodesCPUUsageEdge.query(), { x: 12, y: 30, w: 12, h: 7 }),
     panels.gauge.withAvgTimeThresholds('RPS data quality', 'none', queries.qualityRPS.query(), { x: 0, y: 30, w: 12, h: 4 }),
     panels.gauge.withAvgTimeThresholds('Data quality: $latency_metric', 'none', queries.dataQuality.query(), { x: 12, y: 30, w: 12, h: 4 }),
     panels.table.withTerminationRawData('$termination raw data', 'short', queries.rawData.query(), { x: 8, y: 118, w: 24, h: 8 }),
+
   ]),
 
 ])