diff --git a/charts/mailpit/Chart.yaml b/charts/mailpit/Chart.yaml
index ff463a6..47d82d2 100644
--- a/charts/mailpit/Chart.yaml
+++ b/charts/mailpit/Chart.yaml
@@ -3,7 +3,7 @@ name: mailpit
 description: An email and SMTP testing tool with API for developers
 icon: https://raw.githubusercontent.com/axllent/mailpit/develop/server/ui/mailpit.svg
 type: application
-version: 0.15.1
+version: 0.15.2
 appVersion: 1.15.1
 dependencies:
 - name: common
diff --git a/charts/mailpit/ci/env-values.yaml b/charts/mailpit/ci/env-values.yaml
new file mode 100644
index 0000000..e718d7c
--- /dev/null
+++ b/charts/mailpit/ci/env-values.yaml
@@ -0,0 +1,7 @@
+extraEnvVars:
+  - name: MP_MAX_MESSAGES
+    value: "1000"
+
+## @param extraEnvVarsSecret Name of existing Secret containing extra env vars for containers
+##
+extraEnvVarsSecret: my-secret
diff --git a/charts/mailpit/templates/deployment.yaml b/charts/mailpit/templates/deployment.yaml
index 21a3fa4..c8918cc 100644
--- a/charts/mailpit/templates/deployment.yaml
+++ b/charts/mailpit/templates/deployment.yaml
@@ -91,6 +91,13 @@ spec:
           {{- with .Values.extraEnvVars }}
           env: {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 10 }}
           {{- end }}
+          {{- if .Values.extraEnvVarsSecret }}
+          envFrom:
+            {{- with .Values.extraEnvVarsSecret }}
+            - secretRef:
+                name: {{ template "common.tplvalues.render" (dict "value" . "context" $) }}
+            {{- end }}
+          {{- end }}
           {{- with .Values.resources }}
           resources: {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/charts/mailpit/values.yaml b/charts/mailpit/values.yaml
index bfec00d..5f9e320 100644
--- a/charts/mailpit/values.yaml
+++ b/charts/mailpit/values.yaml
@@ -109,6 +109,10 @@ args: []
 ##
 extraEnvVars: []
 
+## @param extraEnvVarsSecret Name of existing Secret containing extra env vars for containers
+##
+extraEnvVarsSecret: ""
+
 ## @param livenessProbe [object] Enables the livenessProbe for mailpit
 livenessProbe:
   enabled: true