diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47178ee..365c337 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,4 +25,4 @@ jobs:
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
 
     - name: Build & push syncer image
-      run: make build-syncer-image push-syncer-image
+      run: make v2 build-syncer-image push-syncer-image
diff --git a/Makefile b/Makefile
index 67b9c17..3303400 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ $(OUTPUTDIR)/%.json: $(TEMPLATESDIR)/%.jsonnet
 v2: all
 	@echo "Rendered the v2 dashboards with latest grafonnet library"
 
-build-syncer-image: build
+build-syncer-image: v2
 	podman build --platform=${PLATFORM} -f Dockerfile --manifest=${SYNCER_IMG_TAG} .
 
 push-syncer-image:
diff --git a/assets/kube-burner-report-ocp-wrapper/queries.libsonnet b/assets/kube-burner-report-ocp-wrapper/queries.libsonnet
index 4986e39..a849153 100644
--- a/assets/kube-burner-report-ocp-wrapper/queries.libsonnet
+++ b/assets/kube-burner-report-ocp-wrapper/queries.libsonnet
@@ -373,7 +373,7 @@ local elasticsearch = g.query.elasticsearch;
           + elasticsearch.bucketAggs.Terms.settings.withOrder('desc')
           + elasticsearch.bucketAggs.Terms.settings.withOrderBy('1')
           + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1')
-          + elasticsearch.bucketAggs.Terms.settings.withSize("1"),
+          + elasticsearch.bucketAggs.Terms.settings.withSize("3"),
           elasticsearch.bucketAggs.Terms.withField("labels.container.keyword")
           + elasticsearch.bucketAggs.Terms.withId("4")
           + elasticsearch.bucketAggs.Terms.withType('terms')
@@ -1581,4 +1581,4 @@ local elasticsearch = g.query.elasticsearch;
         + elasticsearch.withQuery("uuid.keyword: $uuid AND metricName.keyword: containerMemory-AggregatedWorkers")
         + elasticsearch.withTimeField('timestamp')
   },
-}
\ No newline at end of file
+}
diff --git a/assets/ocp-performance/queries.libsonnet b/assets/ocp-performance/queries.libsonnet
index fee6ca6..274c3a1 100644
--- a/assets/ocp-performance/queries.libsonnet
+++ b/assets/ocp-performance/queries.libsonnet
@@ -77,7 +77,7 @@ local generateTimeSeriesQuery(query, legend) = [
   },
   ovnAnnotationLatency: {
     query():
-        generateTimeSeriesQuery('histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[$interval])) by (pod,le)) > 0', '{{ pod }}')
+        generateTimeSeriesQuery('histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[$interval]))) > 0', '{{ pod }}')
   },
   ovnCNIAdd: {
     query():
diff --git a/assets/ovn-monitoring/queries.libsonnet b/assets/ovn-monitoring/queries.libsonnet
index c37cae9..0f7aece 100644
--- a/assets/ovn-monitoring/queries.libsonnet
+++ b/assets/ovn-monitoring/queries.libsonnet
@@ -57,7 +57,7 @@ local generateTimeSeriesQuery(query, legend) = [
 
     ovnAnnotationLatency: {
         query():
-            generateTimeSeriesQuery('histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[2m])) by (pod,le)) > 0','{{pod}} - Pod Annotation latency')
+            generateTimeSeriesQuery('histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[2m]))) > 0','{{pod}} - Pod Annotation latency')
     },
 
     ovnCNIAdd: {
diff --git a/templates/General/ocp-performance.jsonnet b/templates/General/ocp-performance.jsonnet
index 42a9814..96d1702 100644
--- a/templates/General/ocp-performance.jsonnet
+++ b/templates/General/ocp-performance.jsonnet
@@ -187,7 +187,7 @@ local stackroxMem = genericGraphLegendPanel('Top 25 stackrox container RSS bytes
 // OVN
 local ovnAnnotationLatency = genericGraphPanel('99% Pod Annotation Latency', 's').addTarget(
   prometheus.target(
-    'histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[$interval])) by (pod,le)) > 0',
+    'histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[$interval]))) > 0',
     legendFormat='{{pod}}',
   )
 );
diff --git a/templates/General/ovn-dashboard.jsonnet b/templates/General/ovn-dashboard.jsonnet
index 2d1a3db..93cd51e 100644
--- a/templates/General/ovn-dashboard.jsonnet
+++ b/templates/General/ovn-dashboard.jsonnet
@@ -168,7 +168,7 @@ local work_queue_unfinished_latency = genericGraphLegendPanel('OVNKube Master wo
 
 local ovnAnnotationLatency = genericGraphLegendPanel('Pod Annotation Latency', 's').addTarget(
   prometheus.target(
-    'histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[2m])) by (pod,le)) > 0',
+    'histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[2m]))) > 0',
     legendFormat='{{pod}} - Pod Annotation latency',
   )
 );