diff --git a/addons/grafana/10/chart/grafana/templates/configmap-ini.yaml b/addons/grafana/10/chart/grafana/templates/configmap-ini.yaml
new file mode 100644
index 00000000..980d0878
--- /dev/null
+++ b/addons/grafana/10/chart/grafana/templates/configmap-ini.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}-ini
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+    app.kubernetes.io/component: grafana
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+data:
+  grafana.ini: |
+    [database]
+      type = postgres
+      url = {{ .Values.pg_url | quote }}
diff --git a/addons/grafana/10/chart/grafana/templates/deployment.yaml b/addons/grafana/10/chart/grafana/templates/deployment.yaml
index 38426a73..cf1594a9 100644
--- a/addons/grafana/10/chart/grafana/templates/deployment.yaml
+++ b/addons/grafana/10/chart/grafana/templates/deployment.yaml
@@ -321,7 +321,7 @@ spec:
         - name: grafana-ini
           {{- if .Values.config.grafanaIniConfigMap }}
           configMap:
-            name: {{ .Values.config.grafanaIniConfigMap }}
+            name: {{ include "common.names.fullname" . }}-ini
           {{- else if .Values.config.grafanaIniSecret }}
           secret:
             secretName: {{ .Values.config.grafanaIniSecret }}
diff --git a/addons/grafana/10/chart/grafana/values.yaml b/addons/grafana/10/chart/grafana/values.yaml
index 753732fa..9bec5e4d 100644
--- a/addons/grafana/10/chart/grafana/values.yaml
+++ b/addons/grafana/10/chart/grafana/values.yaml
@@ -209,14 +209,15 @@ ldap:
 ## @param config.grafanaIniSecret Name of the Secret containing the `grafana.ini` file
 ##
 config:
-  useGrafanaIniFile: false
-  grafanaIniConfigMap: ""
+  useGrafanaIniFile: true
+  grafanaIniConfigMap: "grafana-ini"
   grafanaIniSecret: ""
 ## Create dasboard provider to load dashboards, a default one is created to load dashboards
 ## from "/opt/drycc/grafana/dashboards"
 ## @param dashboardsProvider.enabled Enable the use of a Grafana dashboard provider
 ## @param dashboardsProvider.configMapName Name of a ConfigMap containing a custom dashboard provider
 ##
+pg_url: "postgres://user:secret@host:port/database"
 dashboardsProvider:
   enabled: false
   ## Important to set the Path to "/opt/drycc/grafana/dashboards"
@@ -542,7 +543,7 @@ grafana:
 ## @param persistence.size Size for the PV
 ##
 persistence:
-  enabled: true
+  enabled: false
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
diff --git a/addons/grafana/10/meta.yaml b/addons/grafana/10/meta.yaml
index 8e4a9eac..848290eb 100644
--- a/addons/grafana/10/meta.yaml
+++ b/addons/grafana/10/meta.yaml
@@ -23,4 +23,7 @@ allow_parameters:
   description: "service type config for values.yaml"
 - name: "grafana.nodeSelector"
   required: false
+- name: "pg_url"
+  required: true
+  description: "Postgres URL for Grafana to connect to"
 archive: false