diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index a084cc8..3784d76 100644
--- a/charts/quickwit/Chart.yaml
+++ b/charts/quickwit/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.5.2
-appVersion: "v0.6.4"
+version: 0.5.3
+appVersion: "v0.7.0"
 keywords:
   - quickwit
   - search
diff --git a/charts/quickwit/templates/configmap.yaml b/charts/quickwit/templates/configmap.yaml
index 5fd6d5c..bc00da5 100644
--- a/charts/quickwit/templates/configmap.yaml
+++ b/charts/quickwit/templates/configmap.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "quickwit.labels" . | nindent 4 }}
 data:
   node.yaml: |-
-    version: 0.6
+    version: 0.7
     listen_address: 0.0.0.0
     gossip_listen_port: 7282
     data_dir: /quickwit/qwdata
@@ -19,13 +19,13 @@ data:
     {{- $new_storage := . | deepCopy }}
     {{- /* s3 access_key_id and secret_access_key are already set by env variables */}}
     {{ if .s3 }}
-    {{- $_ := unset $new_storage.s3 "access_key_id" }}
-    {{- $_ := unset $new_storage.s3 "secret_access_key" }}
+    {{- $_ := set $new_storage.s3 "access_key_id" "${AWS_ACCESS_KEY_ID}" }}
+    {{- $_ := set $new_storage.s3 "secret_access_key" "${AWS_SECRET_ACCESS_KEY}" }}
     {{- end }}
     {{- /* azure account and access_key are already set by env variables */}}
     {{ if .azure }}
-    {{- $_ := unset $new_storage.azure "account" }}
-    {{- $_ := unset $new_storage.azure "access_key" }}
+    {{- $_ := set $new_storage.azure "account" "${QW_AZURE_STORAGE_ACCOUNT}" }}
+    {{- $_ := set $new_storage.azure "access_key" "${QW_AZURE_STORAGE_ACCESS_KEY}" }}
     {{- end }}
     storage:
       {{- toYaml $new_storage | nindent 6 }}
@@ -42,3 +42,8 @@ data:
     jaeger:
       {{- toYaml . | nindent 6 }}
     {{- end }}
+    {{- if (.Values.config.postgres).max_num_connections }}
+    metastore:
+      postgres:
+        max_num_connections: {{ .Values.config.postgres.max_num_connections }}
+    {{- end }}
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index d9adf9c..71ea84d 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -6,7 +6,7 @@ image:
   repository: quickwit/quickwit
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  # tag: v0.6.1
+  # tag: v0.7.0
 
 imagePullSecrets: []
 nameOverride: ""
@@ -312,6 +312,7 @@ config:
   #   database: metastore
   #   username: quickwit
   #   password: ""
+  #   max_num_connections: 50
 
   s3: {}
     # endpoint: "https://s3.eu-west-1.amazonaws.com"