diff --git a/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml b/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
index a0a5dd768b..b21f1c7181 100644
--- a/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
+++ b/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/part-of: monitoring
 spec:
   chart:
-    spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana" "chart" "tempo" "context" $) | nindent 6 }}
+    spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana-community" "chart" "tempo" "context" $) | nindent 6 }}
   interval: 1h
   driftDetection:
     mode: enabled
diff --git a/charts/base-cluster/values.yaml b/charts/base-cluster/values.yaml
index a2fa7d8c0d..df3d4b6972 100644
--- a/charts/base-cluster/values.yaml
+++ b/charts/base-cluster/values.yaml
@@ -111,8 +111,12 @@ global:
       charts:
         loki: 6.51.0
         alloy: 1.5.3
+      condition: "{{ .Values.monitoring.prometheus.enabled }}"
+    grafana-community:
+      url: https://grafana-community.github.io/helm-charts
+      charts:
         tempo: 1.24.4
-      condition: "{{ and .Values.monitoring.prometheus.enabled (or .Values.monitoring.loki.enabled .Values.monitoring.tracing.enabled) }}"
+      condition: "{{ and .Values.monitoring.prometheus.enabled .Values.monitoring.tracing.enabled }}"
     external-dns:
       url: https://kubernetes-sigs.github.io/external-dns
       charts: