diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 676aceff..3e4e5bb9 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -22,7 +22,7 @@ name: grafana
 sources:
 - https://github.com/grafana/grafana
 type: application
-version: 1.0.6
+version: 1.0.7
 dependencies:
   - name: postgresql
     condition: postgresql.enabled
diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
index 8963c337..68af9746 100644
--- a/charts/grafana/templates/_pod.tpl
+++ b/charts/grafana/templates/_pod.tpl
@@ -381,7 +381,7 @@ containers:
       - name: config
         mountPath: "/etc/grafana/grafana.ini"
         subPath: grafana.ini
-      {{- if .Values.postgresql.enabled }}
+      {{- if .Values.database.enabled }}
       - name: {{ .Values.database.secretMount.name }}
         mountPath: {{ .Values.database.secretMount.mountPath }}
         readOnly: {{ .Values.database.secretMount.readOnly }}
@@ -630,7 +630,7 @@ volumes:
       name: {{ tpl $name $root }}
     {{- end }}
   {{- end }}
-  {{- if .Values.postgresql.enabled }}
+  {{- if .Values.database.enabled }}
   - name: {{ .Values.database.secretMount.name }}
     secret:
       secretName: {{ .Values.database.secretMount.secretName }}
diff --git a/charts/grafana/templates/configmap.yaml b/charts/grafana/templates/configmap.yaml
index e449a6aa..6febfa22 100644
--- a/charts/grafana/templates/configmap.yaml
+++ b/charts/grafana/templates/configmap.yaml
@@ -14,9 +14,9 @@ data:
   plugins: {{ join "," .Values.plugins }}
 {{- end }}
   grafana.ini: |
-{{- if .Values.postgresql.enabled }}
+{{- if .Values.database.enabled }}
     [database]
-    enabled = {{ .Values.postgresql.enabled }}
+    enabled = {{ .Values.database.enabled }}
     type = {{ .Values.database.type }}
     host = {{ .Values.database.host }}
     name = {{ .Values.database.name }}
diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
index 498bfaa7..962f6322 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -908,6 +908,7 @@ postgresql:
     enabled: false 
 
 database: 
+  enabled: false
   type: postgres
   host: grafana-postgresql:5432
   name: postgres
diff --git a/charts/postgresql/Chart.yaml b/charts/postgresql/Chart.yaml
index 0f8dd971..523f2f4d 100644
--- a/charts/postgresql/Chart.yaml
+++ b/charts/postgresql/Chart.yaml
@@ -36,4 +36,4 @@ maintainers:
 name: postgresql
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/postgresql
-version: 1.0.2
+version: 1.0.3
diff --git a/charts/postgresql/values.yaml b/charts/postgresql/values.yaml
index 436245e4..763340bd 100644
--- a/charts/postgresql/values.yaml
+++ b/charts/postgresql/values.yaml
@@ -1545,7 +1545,7 @@ metrics:
   serviceMonitor:
     ## @param metrics.serviceMonitor.enabled Create ServiceMonitor Resource for scraping metrics using Prometheus Operator
     ##
-    enabled: true
+    enabled: false
     ## @param metrics.serviceMonitor.namespace Namespace for the ServiceMonitor Resource (defaults to the Release Namespace)
     ##
     namespace: ""