diff --git a/hack/grafana-dashboards-configmap-generator b/hack/grafana-dashboards-configmap-generator
new file mode 160000
index 0000000000000000000000000000000000000000..f901955e8c95b8dd7f3c038caabc0a8d41eec125
--- /dev/null
+++ b/hack/grafana-dashboards-configmap-generator
@@ -0,0 +1 @@
+Subproject commit f901955e8c95b8dd7f3c038caabc0a8d41eec125
diff --git a/hack/scripts/generate-manifests.sh b/hack/scripts/generate-manifests.sh
index 280bc121e6666f35707a87364855fb6992d26af6..64287dae2d06288ef149a131b270fb02801d80f2 100755
--- a/hack/scripts/generate-manifests.sh
+++ b/hack/scripts/generate-manifests.sh
@@ -4,7 +4,14 @@
 hack/scripts/generate-rules-configmap.sh > manifests/prometheus/prometheus-k8s-rules.yaml
 
 # Generate Dashboard ConfigMap
-hack/scripts/generate-dashboards-configmap.sh > manifests/grafana/grafana-dashboards.yaml
+#hack/scripts/generate-dashboards-configmap.sh > manifests/grafana/grafana-dashboards.yaml
+
+# Generate Dashboard ConfigMap with configmap-generator tool
+# Max Size per ConfigMap: 240000
+# Input dir: assets/grafana
+# output file: manifests/grafana/grafana-dashboards.yaml
+test -f manifests/grafana/grafana-dashboards.yaml && rm -f manifests/grafana/grafana-dashboards.yaml
+hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh -s 240000 -i assets/grafana -o manifests/grafana/grafana-dashboards.yaml
 
 # Generate Grafana Credentials Secret
 hack/scripts/generate-grafana-credentials-secret.sh admin admin > manifests/grafana/grafana-credentials.yaml
diff --git a/manifests/grafana/grafana-dashboards.yaml b/manifests/grafana/grafana-dashboards.yaml
index 92a88fbf4c6c7e84b36dad90a7e24f8f45fc57a7..a11795529e9558e36561dc390c55b0f1dddece0e 100644
--- a/manifests/grafana/grafana-dashboards.yaml
+++ b/manifests/grafana/grafana-dashboards.yaml
@@ -3425,3 +3425,4 @@ data:
         "type": "prometheus",
         "url": "http://prometheus-k8s.monitoring.svc:9090"
     }
+---