diff --git a/infra/tf/grafana/grafana.tf b/infra/tf/grafana/grafana.tf
index cae1e286c3..1051062ddb 100644
--- a/infra/tf/grafana/grafana.tf
+++ b/infra/tf/grafana/grafana.tf
@@ -106,6 +106,7 @@ resource "helm_release" "grafana" {
 		sidecar = {
 			dashboards = {
 				enabled = true
+				searchNamespace = ["grafana", "prometheus"]
 			}
 		}
 
diff --git a/infra/tf/k8s_infra/prometheus.tf b/infra/tf/k8s_infra/prometheus.tf
index 1130cc18cd..f9135dddcb 100644
--- a/infra/tf/k8s_infra/prometheus.tf
+++ b/infra/tf/k8s_infra/prometheus.tf
@@ -318,6 +318,7 @@ resource "helm_release" "prometheus" {
 		# Configured in grafana.tf
 		grafana = {
 			enabled = false
+			forceDeployDashboards = true
 		}
 
 		extraManifests = flatten([