diff --git a/base/monitoring/grafana/grafana.ConfigMap.yaml b/base/monitoring/grafana/grafana.ConfigMap.yaml
index 3ecccbe7..ceb0d1c2 100644
--- a/base/monitoring/grafana/grafana.ConfigMap.yaml
+++ b/base/monitoring/grafana/grafana.ConfigMap.yaml
@@ -19,10 +19,10 @@ data:
         editable: false
       - name: pgsql
         type: postgres
-        url: $PGHOST:$PGPORT
-        user: $PGGRAFANAUSER
-        database: $PGDATABASE
+        url: $GRAFANA_PGSQL_HOST:$GRAFANA_PGSQL_PORT
+        user: $GRAFANA_PGSQL_USER
+        database: $GRAFANA_PGSQL_DATABASE
         secureJsonData:
-          password: $PGGRAFANAPASSWORD
+          password: $GRAFANA_PGSQL_PASSWORD
         jsonData:
-          sslmode: $PGSSLMODE
+          sslmode: $GRAFANA_PGSQL_SSLMODE