diff --git a/charts/etcd/Chart.yaml b/charts/etcd/Chart.yaml
index d797d8f9b03e208b0e8c1ec03f2fc09db9ba680f..72e56f63fae7ce6cf765cea39f4b4b97cf47813e 100644
--- a/charts/etcd/Chart.yaml
+++ b/charts/etcd/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.5
+version: "0.1.6"
 
 appVersion: "v3.5.9"
diff --git a/charts/etcd/README.md b/charts/etcd/README.md
index bc822027c0d108e1afc44cb92995bc83faa450f4..fbe23e4fcfae7e39d0169ec1a821be6c70ab7af9 100644
--- a/charts/etcd/README.md
+++ b/charts/etcd/README.md
@@ -1,6 +1,6 @@
 # Etcd
 
-![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.5.9](https://img.shields.io/badge/AppVersion-v3.5.9-informational?style=flat-square)
+![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.5.9](https://img.shields.io/badge/AppVersion-v3.5.9-informational?style=flat-square)
 
 ## Changelog
 
@@ -145,3 +145,4 @@ helm uninstall my-release
 | extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
 | extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
 | extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
+| extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
diff --git a/charts/etcd/RELEASENOTES.md b/charts/etcd/RELEASENOTES.md
index 2f8c4822bd24b1c14d6d58731ce69e96f41f84f2..d207dd69b4aab645caf299790ba63c6e9c7cfaac 100644
--- a/charts/etcd/RELEASENOTES.md
+++ b/charts/etcd/RELEASENOTES.md
@@ -8,4 +8,5 @@
 | 0.1.3 | v3.5.7 | Fixed "nil" syntax error for health checks (thx @omegazeng) |
 | 0.1.4 | v3.5.8 | Upgraded etcd to v3.5.8 |
 | 0.1.5 | v3.5.9 | Upgraded etcd to v3.5.9 |
+| 0.1.6 | v3.5.8 | Added support for custom secrets and additional environment configurations |
 | | | |
diff --git a/charts/etcd/templates/statefulset.yaml b/charts/etcd/templates/statefulset.yaml
index 08ff228050703593d828dc7d8808d69cb32eb267..ed75e2729281f090776a8b99d08c08691348e443 100644
--- a/charts/etcd/templates/statefulset.yaml
+++ b/charts/etcd/templates/statefulset.yaml
@@ -169,6 +169,10 @@ spec:
             - secretRef:
                 name: {{ . }}
           {{- end }}
+          {{- range .Values.extraEnvConfigs }}
+            - configMapRef:
+                name: {{ . }}
+          {{- end }}
           volumeMounts:
             - name: {{ .Values.storage.volumeName }}
               mountPath: /data
diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
index 8e4a2c57fab7aea9688b611ad20efee59532b67b..475f7c266b3f7967ce4ad73ff360e2416ec904ff 100644
--- a/charts/etcd/values.yaml
+++ b/charts/etcd/values.yaml
@@ -172,6 +172,9 @@ args: []
 ## A list of existing secrets that will be mounted into the container as environment variables
 extraEnvSecrets: []
 
+## A list of existing configmaps that will be mounted into the container as environment variables
+extraEnvConfigs: []
+
 ## A list of additional existing secrets that will be mounted into the etcd container
 ## The mounted files of the secrets can be used for custom configuration options (see https.enabled)
 extraSecrets: []
diff --git a/charts/ghost/README.md b/charts/ghost/README.md
index 735d16c0f1d9c5c78e347b9f1ea84e0456f067fa..9895db5f98eb2046db942d0c84ab74d7fa1222d2 100644
--- a/charts/ghost/README.md
+++ b/charts/ghost/README.md
@@ -159,3 +159,5 @@ helm uninstall my-release
 | extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
 | extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
 | extraSecrets | list | `[]` | A list of additional existing secrets that will be mounted into the container |
+| extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
+| extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
index c1ef4733de06d88801af8e985d852096f9a635b1..6126ba193dc46b72641c35014ff8f806537ef82b 100644
--- a/charts/nextcloud/README.md
+++ b/charts/nextcloud/README.md
@@ -243,6 +243,8 @@ helm uninstall my-release
 | extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
 | extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
 | extraSecrets | list | `[]` | A list of additional existing secrets that will be mounted into the container |
+| extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
+| extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
 
 ## Storage parameters
 
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index abebc897653c531600b9e03b5d492dc230d85b4e..beb642c3a0ef2d2b04131cf3a1b7ed548212658d 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -145,6 +145,8 @@ helm uninstall my-release
 | extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
 | extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
 | extraSecrets | list | `[]` | A list of additional existing secrets that will be mounted into the container |
+| extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
+| extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
 
 ## Storage parameters