diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index a217013..7953e97 100644
--- a/charts/quickwit/Chart.yaml
+++ b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.3.6
+version: 0.3.7
 appVersion: v0.5.0
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
index 0cb4c08..8ff59a7 100644
--- a/charts/quickwit/templates/_helpers.tpl
+++ b/charts/quickwit/templates/_helpers.tpl
@@ -183,7 +183,10 @@ Quickwit metastore environment
 */}}
 {{- define "quickwit.metastore.environment" -}}
 {{ include "quickwit.environment" . }}
-{{- if .Values.config.postgres }}
+{{- if .Values.config.metastore_uri }}
+- name: QW_METASTORE_URI
+  value: {{ .Values.config.metastore_uri }}
+{{- else if .Values.config.postgres }}
 - name: POSTGRES_HOST
   value: {{ required "A valid config.postgres.host is required!" .Values.config.postgres.host }}
 - name: POSTGRES_PORT