diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 0826639e..69292fbf 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -30,8 +30,10 @@ spec:
           env:
           - name: KAFKA_BROKERCONNECT
             value: "{{ .Values.kafka.brokerConnect }}"
+          {{- if .Values.kafka.properties }}
           - name: KAFKA_PROPERTIES
             value: "{{ .Values.kafka.properties }}"
+          {{- end }}
           - name: KAFKA_TRUSTSTORE
             value: "{{ .Values.kafka.truststore }}"
           - name: KAFKA_KEYSTORE
@@ -52,6 +54,9 @@ spec:
             value: "{{ .Values.kafka.keystoreFile }}"
           - name: SERVER_PORT
             value: "{{ .Values.server.port }}"
+          {{- if .Values.extraEnvVars }}
+          {{- .Values.extraEnvVars | toYaml | nindent 10 }}
+          {{- end }}
           - name: CMD_ARGS
 {{- if .Values.mountProtoDesc.enabled }}
             value: "--message.format=PROTOBUF --protobufdesc.directory=/protodesc/ {{ .Values.cmdArgs }}"
diff --git a/chart/values.yaml b/chart/values.yaml
index ce23b933..ef0fc1ba 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,5 +1,10 @@
 replicaCount: 1
 
+## extraEnvVars:
+##   - name: FOO
+##     value: "bar"
+extraEnvVars: []
+
 image:
   repository: obsidiandynamics/kafdrop
   tag: latest