diff --git a/charts/kminion/templates/deployment.yaml b/charts/kminion/templates/deployment.yaml
index d652960..1b4379d 100644
--- a/charts/kminion/templates/deployment.yaml
+++ b/charts/kminion/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
       {{- end}}
       labels:
         {{- include "kminion.selectorLabels" . | nindent 8}}
-        {{- if .Values.customLabels}}
+        {{- if .Values.customLabels -}}
         {{toYaml .Values.customLabels | nindent 8}}
         {{- end}}
     spec:
@@ -44,6 +44,14 @@ spec:
           secret:
             secretName: {{.secretName}}
         {{- end}}
+        {{- range .Values.deployment.volumes.emptyDir}}
+        - name: {{.name}}
+          emptydir: {}
+        {{- end}}
+      initContainers:
+      {{- with .Values.deployment.initContainers }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{.Chart.Name}}
           securityContext:
@@ -89,6 +97,9 @@ spec:
               path: /ready
               port: {{.Values.service.port}}
             initialDelaySeconds: 10
+        {{- with .Values.deployment.extraContainers }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector}}
       nodeSelector:
         {{- toYaml . | nindent 8}}
diff --git a/charts/kminion/values.yaml b/charts/kminion/values.yaml
index fe1fa30..04f903f 100644
--- a/charts/kminion/values.yaml
+++ b/charts/kminion/values.yaml
@@ -116,6 +116,8 @@ deployment:
     secrets: []
     # - secretName: vault-tls
     #   mountPath: /vault/tls
+    emptyDir: []
+    # - name: example
 
   # If you want to provide specifc config settings like sensitive Kafka credentials via environment variables you can
   # do so by making them available here. See the kminion reference config to figure out the expected variable names.
@@ -137,6 +139,11 @@ deployment:
     #   secretName: kafka-credentials-team-xy
     #   secretKey: password
 
+  # Add additional containers, e. g. for oauth2-proxy
+  extraContainers: {}
+  # Add additional init containers, e. g. for oauth2-proxy
+  initContainers: {}
+
 kminion:
   # KMinion can be configured using environment variables and/or a YAML config. The yaml contents under config will
   # end up in a YAML file which will be mounted into the kminion container.