diff --git a/charts/langsmith/templates/backend/api-deployment.yaml b/charts/langsmith/templates/backend/api-deployment.yaml
index a2eb94e..108cb3d 100644
--- a/charts/langsmith/templates/backend/api-deployment.yaml
+++ b/charts/langsmith/templates/backend/api-deployment.yaml
@@ -53,6 +53,9 @@ spec:
               value: {{ .Values.backend.containerPort | quote }}
             - name: AUTH_TYPE
               value: api_key
+            {{- with .Values.backend.deployment.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           image: "{{ .Values.images.backendImage.repository }}:{{ .Values.images.backendImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.backendImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/backend/deployment.yaml b/charts/langsmith/templates/backend/deployment.yaml
index cc17418..478f189 100644
--- a/charts/langsmith/templates/backend/deployment.yaml
+++ b/charts/langsmith/templates/backend/deployment.yaml
@@ -50,6 +50,9 @@ spec:
                   key: openai_api_key
             - name: PORT
               value: {{ .Values.backend.containerPort | quote }}
+            {{- with .Values.backend.deployment.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           image: "{{ .Values.images.backendImage.repository }}:{{ .Values.images.backendImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.backendImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/frontend/deployment.yaml b/charts/langsmith/templates/frontend/deployment.yaml
index a250c17..ae9d597 100644
--- a/charts/langsmith/templates/frontend/deployment.yaml
+++ b/charts/langsmith/templates/frontend/deployment.yaml
@@ -63,6 +63,9 @@ spec:
                 secretKeyRef:
                   key: oauth_issuer_url
                   name: {{ include "langsmith.secretsName" .}}
+            {{- with .Values.frontend.deployment.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           image: "{{ .Values.images.frontendImage.repository }}:{{ .Values.images.frontendImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.frontendImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/hub-backend/api-deployment.yaml b/charts/langsmith/templates/hub-backend/api-deployment.yaml
index 3efe9a1..ada5af7 100644
--- a/charts/langsmith/templates/hub-backend/api-deployment.yaml
+++ b/charts/langsmith/templates/hub-backend/api-deployment.yaml
@@ -48,6 +48,9 @@ spec:
               value: {{ .Values.hubBackend.containerPort | quote }}
             - name: AUTH_TYPE
               value: 'api_key'
+            {{- with .Values.hubBackend.deployment.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           image: "{{ .Values.images.hubBackendImage.repository }}:{{ .Values.images.hubBackendImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.hubBackendImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/hub-backend/deployment.yaml b/charts/langsmith/templates/hub-backend/deployment.yaml
index bc12d86..1a26fb5 100644
--- a/charts/langsmith/templates/hub-backend/deployment.yaml
+++ b/charts/langsmith/templates/hub-backend/deployment.yaml
@@ -45,6 +45,9 @@ spec:
             {{- include "langsmith.commonEnv" . | nindent 12 }}
             - name: PORT
               value: {{ .Values.hubBackend.containerPort | quote }}
+            {{- with .Values.hubBackend.deployment.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           image: "{{ .Values.images.hubBackendImage.repository }}:{{ .Values.images.hubBackendImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.hubBackendImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/playground/deployment.yaml b/charts/langsmith/templates/playground/deployment.yaml
index d3d8fac..6f84c4b 100644
--- a/charts/langsmith/templates/playground/deployment.yaml
+++ b/charts/langsmith/templates/playground/deployment.yaml
@@ -41,6 +41,10 @@ spec:
         {{- toYaml .Values.playground.deployment.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Values.playground.name }}
+          {{- with .Values.playground.deployment.extraEnv }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.images.playgroundImage.repository }}:{{ .Values.images.playgroundImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.playgroundImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/postgres/stateful-set.yaml b/charts/langsmith/templates/postgres/stateful-set.yaml
index 647ed59..b29994d 100644
--- a/charts/langsmith/templates/postgres/stateful-set.yaml
+++ b/charts/langsmith/templates/postgres/stateful-set.yaml
@@ -56,6 +56,9 @@ spec:
               value: postgres
             - name: PGDATA
               value: /var/lib/postgresql/data/postgres
+            {{- with .Values.postgres.statefulSet.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
           image: "{{ .Values.images.postgresImage.repository }}:{{ .Values.images.postgresImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.postgresImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/templates/redis/stateful-set.yaml b/charts/langsmith/templates/redis/stateful-set.yaml
index b6ab8ee..778d928 100644
--- a/charts/langsmith/templates/redis/stateful-set.yaml
+++ b/charts/langsmith/templates/redis/stateful-set.yaml
@@ -41,6 +41,10 @@ spec:
         {{- toYaml .Values.redis.statefulSet.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Values.redis.name }}
+          {{- with .Values.redis.statefulSet.extraEnv }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.images.redisImage.repository }}:{{ .Values.images.redisImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.images.redisImage.pullPolicy }}
           ports:
diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml
index 21d668e..c888176 100644
--- a/charts/langsmith/values.yaml
+++ b/charts/langsmith/values.yaml
@@ -64,6 +64,13 @@ backend:
     podSecurityContext: {}
     securityContext: {}
     resources: {}
+#      limits:
+#        cpu: 1000m
+#        memory: 1Gi
+#      requests:
+#        cpu: 200m
+#        memory: 500Mi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -80,6 +87,7 @@ backend:
 #      requests:
 #        cpu: 200m
 #        memory: 500Mi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -110,6 +118,7 @@ frontend:
 #      requests:
 #        cpu: 200m
 #        memory: 500Mi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -141,6 +150,7 @@ hubBackend:
 #      requests:
 #        cpu: 200m
 #        memory: 500Mi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -171,6 +181,7 @@ playground:
 #      requests:
 #        cpu: 200m
 #        memory: 500Mi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -213,6 +224,7 @@ postgres:
 #      requests:
 #        cpu: 1000m
 #        memory: 4Gi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -241,6 +253,7 @@ queue:
 #      requests:
 #        cpu: 200m
 #        memory: 500Mi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -271,6 +284,7 @@ redis:
 #      requests:
 #        cpu: 1000m
 #        memory: 2Gi
+    extraEnv: []
     nodeSelector: {}
     tolerations: []
     affinity: {}