diff --git a/grampsweb/Chart.yaml b/grampsweb/Chart.yaml
index 13ef6e3..21deb39 100644
--- a/grampsweb/Chart.yaml
+++ b/grampsweb/Chart.yaml
@@ -3,7 +3,7 @@ name: grampsweb
 description: A Helm chart for gramps web
 icon: https://raw.githubusercontent.com/gramps-project/Gramps.js/main/images/icon512.png
 type: application
-version: 0.1.13
+version: 0.1.14
 # renovate: image=ghcr.io/gramps-project/grampsweb
 appVersion: "24.7.0"
 maintainers:
diff --git a/grampsweb/README.adoc b/grampsweb/README.adoc
index 7ae6092..de59de3 100644
--- a/grampsweb/README.adoc
+++ b/grampsweb/README.adoc
@@ -2,7 +2,7 @@
 
 = grampsweb
 
-image::https://img.shields.io/badge/Version-0.1.13-informational?style=flat-square[Version: 0.1.13]
+image::https://img.shields.io/badge/Version-0.1.14-informational?style=flat-square[Version: 0.1.14]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-24.7.0-informational?style=flat-square[AppVersion: 24.7.0]
 == Maintainers
@@ -80,7 +80,7 @@ helm uninstall grampsweb-release
 | gramps.baseURL
 | string
 | `"https://gramps.example.org"`
-|
+| Base URL where the API can be reached (e.g. https://mygramps.mydomain.com/). This is necessary e.g. to build correct passwort reset links
 
 | gramps.mail.from
 | string
@@ -112,10 +112,15 @@ helm uninstall grampsweb-release
 | `nil`
 | SMTP server username
 
+| gramps.mediaPrefixTree
+| bool
+| `false`
+| whether or not to use a separate subfolder for the media files of each tree. Defaults to False, but strongly recommend to use True in a multi-tree setup
+
 | gramps.tree
 | string
 | `"Gramps Web"`
-|
+| To enable multi-tree support, the TREE config option must be set to a single asterisk `*`
 
 | image.pullPolicy
 | string
diff --git a/grampsweb/templates/deployment.yaml b/grampsweb/templates/deployment.yaml
index 7c6592f..f3e15ae 100644
--- a/grampsweb/templates/deployment.yaml
+++ b/grampsweb/templates/deployment.yaml
@@ -36,13 +36,6 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- with .Values.gramps }}
-          env:
-            - name: "GRAMPSWEB_TREE"
-              value: "{{ .tree }}"
-            - name: "GRAMPSWEB_BASE_URL"
-              value: "{{ .baseURL }}"
-          {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "grampsweb.fullname" . }}
diff --git a/grampsweb/templates/secret.yaml b/grampsweb/templates/secret.yaml
index ab2b1b0..2baa59e 100644
--- a/grampsweb/templates/secret.yaml
+++ b/grampsweb/templates/secret.yaml
@@ -6,6 +6,15 @@ metadata:
   labels:
     {{- include "grampsweb.labels" . | nindent 4 }}
 data:
+  {{- with .Values.gramps.baseURL }}
+  GRAMPSWEB_BASE_URL: {{ . | b64enc }}
+  {{- end }}
+  {{- with .Values.gramps.tree }}
+  GRAMPSWEB_TREE: {{ . | b64enc }}
+  {{- end }}
+  {{- with .Values.gramps.mediaPrefixTree }}
+  GRAMPSWEB_MEDIA_PREFIX_TREE: {{ . | ternary "TRUE" "FALSE" | b64enc }}
+  {{- end }}
   {{- with .Values.gramps.mediaBaseDir }}
   GRAMPSWEB_MEDIA_BASE_DIR: {{ . | b64enc }}
   {{- end }}
diff --git a/grampsweb/values.yaml b/grampsweb/values.yaml
index 0fc804a..a088a88 100644
--- a/grampsweb/values.yaml
+++ b/grampsweb/values.yaml
@@ -16,8 +16,12 @@ nameOverride: ""
 fullnameOverride: ""
 
 gramps:
+  # -- To enable multi-tree support, the TREE config option must be set to a single asterisk `*`
   tree: "Gramps Web"
+  # -- Base URL where the API can be reached (e.g. https://mygramps.mydomain.com/). This is necessary e.g. to build correct passwort reset links
   baseURL: "https://gramps.example.org"
+  # -- whether or not to use a separate subfolder for the media files of each tree. Defaults to False, but strongly recommend to use True in a multi-tree setup
+  mediaPrefixTree: false
   mail:
     # -- SMTP server host (e.g. for sending password reset e-mails)
     host: