diff --git a/charts/snappymail/v0.1.0/templates/deployment.yaml b/charts/snappymail/v0.1.0/templates/deployment.yaml
index c439d82..2372d9f 100644
--- a/charts/snappymail/v0.1.0/templates/deployment.yaml
+++ b/charts/snappymail/v0.1.0/templates/deployment.yaml
@@ -32,6 +32,15 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: UPLOAD_MAX_SIZE
+              value: {{ .Values.snappymail.uploadMaxSize | quote }}
+            - name: LOG_TO_STDERR
+              value: {{ .Values.snappymail.logToStderr | quote }}
+            - name: MEMORY_LIMIT
+              value: {{ .Values.snappymail.memoryLimit | quote }}
+            - name: SECURE_COOKIES
+              value: {{ .Values.snappymail.secureCookies | quote }}
           volumeMounts:
             - mountPath: /snappymail/data
               name: snappymaildata
diff --git a/charts/snappymail/v0.1.0/values.yaml b/charts/snappymail/v0.1.0/values.yaml
index 235e488..b334a90 100644
--- a/charts/snappymail/v0.1.0/values.yaml
+++ b/charts/snappymail/v0.1.0/values.yaml
@@ -29,6 +29,12 @@ service:
   type: ClusterIP
   port: 80
 
+snappymail:
+  uploadMaxSize: 25M
+  memoryLimit: 128M
+  secureCookies: true
+  logToStderr: true
+
 ingress:
   enabled: false
   className: ""
@@ -69,6 +75,8 @@ persistence:
   size: 8Gi
   storageClass: ""
 
+
+
 # MariaDB configuration for storing contact information
 mariadb:
   auth: