diff --git a/charts/camunda-platform-8.6/templates/optimize/deployment.yaml b/charts/camunda-platform-8.6/templates/optimize/deployment.yaml
index 1810894773..72058ad18f 100644
--- a/charts/camunda-platform-8.6/templates/optimize/deployment.yaml
+++ b/charts/camunda-platform-8.6/templates/optimize/deployment.yaml
@@ -88,6 +88,9 @@ spec:
             - name: CAMUNDA_OPTIMIZE_OPENSEARCH_AWS_ENABLED
               value: "true"
             {{- end }}
+            {{- with .Values.optimize.env }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- end }}
             {{- with .Values.optimize.migration.env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}
diff --git a/charts/camunda-platform-alpha/templates/optimize/deployment.yaml b/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
index 3ac8f8e442..9d6f8768a3 100644
--- a/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
+++ b/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
@@ -88,6 +88,9 @@ spec:
             - name: CAMUNDA_OPTIMIZE_OPENSEARCH_AWS_ENABLED
               value: "true"
             {{- end }}
+            {{- with .Values.optimize.env }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- end }}
             {{- with .Values.optimize.migration.env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}