diff --git a/accounts/templates/CONFIGURATION.tmpl b/accounts/templates/CONFIGURATION.tmpl
index 66aa779c56..e56dd42397 100644
--- a/accounts/templates/CONFIGURATION.tmpl
+++ b/accounts/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/glauth/templates/CONFIGURATION.tmpl b/glauth/templates/CONFIGURATION.tmpl
index e46dd9a74e..1b8e77928a 100644
--- a/glauth/templates/CONFIGURATION.tmpl
+++ b/glauth/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/konnectd/templates/CONFIGURATION.tmpl b/konnectd/templates/CONFIGURATION.tmpl
index fd3928db03..4b70fdbdab 100644
--- a/konnectd/templates/CONFIGURATION.tmpl
+++ b/konnectd/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/ocis/templates/CONFIGURATION.tmpl b/ocis/templates/CONFIGURATION.tmpl
index 71cd95483d..d86a7033c4 100644
--- a/ocis/templates/CONFIGURATION.tmpl
+++ b/ocis/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -45,6 +45,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/ocs/templates/CONFIGURATION.tmpl b/ocs/templates/CONFIGURATION.tmpl
index 614ed317e0..55d5b95aab 100644
--- a/ocs/templates/CONFIGURATION.tmpl
+++ b/ocs/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/onlyoffice/templates/CONFIGURATION.tmpl b/onlyoffice/templates/CONFIGURATION.tmpl
index 9d59cc321d..1919e5735c 100644
--- a/onlyoffice/templates/CONFIGURATION.tmpl
+++ b/onlyoffice/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -45,6 +45,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/proxy/templates/CONFIGURATION.tmpl b/proxy/templates/CONFIGURATION.tmpl
index c18cf7e7bd..f2097e4465 100644
--- a/proxy/templates/CONFIGURATION.tmpl
+++ b/proxy/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+--{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/settings/templates/CONFIGURATION.tmpl b/settings/templates/CONFIGURATION.tmpl
index d0379013f7..b918d8c2c1 100644
--- a/settings/templates/CONFIGURATION.tmpl
+++ b/settings/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/storage/templates/CONFIGURATION.tmpl b/storage/templates/CONFIGURATION.tmpl
index 78b5b5ac3c..109c7ae2fa 100644
--- a/storage/templates/CONFIGURATION.tmpl
+++ b/storage/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -24,7 +24,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{- range $o := $options }}{{ with (list $o $oName) -}}
 {{- $o := first . }}
 {{- if eq $o.FnName (last .) -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -54,6 +54,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/store/templates/CONFIGURATION.tmpl b/store/templates/CONFIGURATION.tmpl
index a5b5d071c3..d62b484439 100644
--- a/store/templates/CONFIGURATION.tmpl
+++ b/store/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/thumbnails/templates/CONFIGURATION.tmpl b/thumbnails/templates/CONFIGURATION.tmpl
index 1c92e4ca5c..39b0175939 100644
--- a/thumbnails/templates/CONFIGURATION.tmpl
+++ b/thumbnails/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/web/templates/CONFIGURATION.tmpl b/web/templates/CONFIGURATION.tmpl
index 2876ca8e60..2a43964eb7 100644
--- a/web/templates/CONFIGURATION.tmpl
+++ b/web/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
diff --git a/webdav/templates/CONFIGURATION.tmpl b/webdav/templates/CONFIGURATION.tmpl
index d746231cee..7aea1bee54 100644
--- a/webdav/templates/CONFIGURATION.tmpl
+++ b/webdav/templates/CONFIGURATION.tmpl
@@ -11,7 +11,7 @@ geekdocFilePath: CONFIGURATION.tmpl
 {{ range $opt := first . }}{{ with list $fnName $opt -}}
 {{ $o := last . -}}
 {{ if eq $o.FnName $fnName -}}
---{{ $o.Name }} | ${{ index $o.Env 0 }}  
+-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }}
 : {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
 
 {{ end -}}
@@ -41,6 +41,8 @@ So far we support the file formats `JSON` and `YAML`, if you want to get a full
 
 If you prefer to configure the service with environment variables you can see the available variables below.
 
+If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.
+
 ### Commandline flags
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.