diff --git a/charts/localstack/Chart.yaml b/charts/localstack/Chart.yaml
index a85da6c..ec44a92 100644
--- a/charts/localstack/Chart.yaml
+++ b/charts/localstack/Chart.yaml
@@ -2,7 +2,7 @@ annotations:
   category: Infrastructure
 apiVersion: v2
 appVersion: latest
-version: 0.6.15
+version: 0.6.16
 name: localstack
 description: LocalStack - a fully functional local AWS cloud stack
 type: application
diff --git a/charts/localstack/templates/deployment.yaml b/charts/localstack/templates/deployment.yaml
index f7ace62..3cb1086 100644
--- a/charts/localstack/templates/deployment.yaml
+++ b/charts/localstack/templates/deployment.yaml
@@ -188,6 +188,10 @@ spec:
             {{- if .Values.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
+          {{- if .Values.envFrom }}
+          envFrom:
+            {{- toYaml .Values.envFrom | nindent 12 }}
+          {{- end }}
         {{- if .Values.mountDind.enabled }}
         - name: dind
           image: {{ .Values.mountDind.image | quote }}
diff --git a/charts/localstack/values.yaml b/charts/localstack/values.yaml
index 3451e36..8622b49 100644
--- a/charts/localstack/values.yaml
+++ b/charts/localstack/values.yaml
@@ -97,6 +97,11 @@ mountDind:
 ##     value: "serverless,sqs,es"
 extraEnvVars: []
 
+## envFrom Allows you to set additional environment variables from a ConfigMap or Secret
+## - configMapRef:
+##     name: configmap-name
+envFrom: []
+
 livenessProbe:
   initialDelaySeconds: 0
   periodSeconds: 10