diff --git a/argocd/manifests/grafana/configmap.yaml b/argocd/manifests/grafana/configmap.yaml
index 077779b..48baebb 100644
--- a/argocd/manifests/grafana/configmap.yaml
+++ b/argocd/manifests/grafana/configmap.yaml
@@ -63,6 +63,7 @@ data:
       database: teslamate
       editable: false
       jsonData:
+        database: teslamate
         connMaxLifetime: 14400
         maxIdleConns: 2
         maxOpenConns: 5
diff --git a/docs/changelog.d/fix-grafana-teslamate-datasource.bugfix.md b/docs/changelog.d/fix-grafana-teslamate-datasource.bugfix.md
new file mode 100644
index 0000000..f757f96
--- /dev/null
+++ b/docs/changelog.d/fix-grafana-teslamate-datasource.bugfix.md
@@ -0,0 +1 @@
+Fix TeslaMate dashboards showing "No Data": Grafana 12.x's `grafana-postgresql-datasource` plugin requires the database name in `jsonData`, not just the top-level `database` field.