diff --git a/charts/camunda-platform-alpha/templates/operate/configmap.yaml b/charts/camunda-platform-alpha/templates/operate/configmap.yaml
index 2abeceec36..2153fc5e6b 100644
--- a/charts/camunda-platform-alpha/templates/operate/configmap.yaml
+++ b/charts/camunda-platform-alpha/templates/operate/configmap.yaml
@@ -118,6 +118,9 @@ data:
       {{- if .Values.global.opensearch.enabled }}
       opensearch:
         url: {{ include "camundaPlatform.opensearchURL" . | quote }}
+        {{- if .Values.global.opensearch.aws.enabled }}
+        awsEnabled: true
+        {{- end }}
         {{- if .Values.global.opensearch.auth.username }}
         username: {{ .Values.global.opensearch.auth.username | quote }}
         {{- end }}
diff --git a/charts/camunda-platform-alpha/templates/optimize/deployment.yaml b/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
index 00e405b16c..1810894773 100644
--- a/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
+++ b/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
@@ -84,6 +84,10 @@ spec:
             - name: OPTIMIZE_ELASTICSEARCH_HTTP_PORT
               value: {{ .Values.global.elasticsearch.url.port | quote }}
             {{- end }}
+            {{- if .Values.global.opensearch.aws.enabled }}
+            - name: CAMUNDA_OPTIMIZE_OPENSEARCH_AWS_ENABLED
+              value: "true"
+            {{- end }}
             {{- with .Values.optimize.migration.env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}
@@ -200,6 +204,10 @@ spec:
             - name: CAMUNDA_OPTIMIZE_CACHES_CLOUD_TENANT_AUTHORIZATIONS_MIN_FETCH_INTERVAL_SECONDS
               value: "600000"
             {{- end }}
+            {{- if .Values.global.opensearch.aws.enabled }}
+            - name: CAMUNDA_OPTIMIZE_OPENSEARCH_AWS_ENABLED
+              value: "true"
+            {{- end }}
           {{- with .Values.optimize.env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
diff --git a/charts/camunda-platform-alpha/templates/tasklist/configmap.yaml b/charts/camunda-platform-alpha/templates/tasklist/configmap.yaml
index bb3fbbe90d..d87dc359da 100644
--- a/charts/camunda-platform-alpha/templates/tasklist/configmap.yaml
+++ b/charts/camunda-platform-alpha/templates/tasklist/configmap.yaml
@@ -117,6 +117,9 @@ data:
       database: opensearch
       opensearch:
         url: {{ include "camundaPlatform.opensearchURL" . | quote }}
+        {{- if .Values.global.opensearch.aws.enabled }}
+        awsEnabled: true
+        {{- end }}
         {{- if .Values.global.opensearch.auth.username }}
         username: {{ .Values.global.opensearch.auth.username | quote }}
         {{- end }}
diff --git a/charts/camunda-platform-latest/templates/operate/configmap.yaml b/charts/camunda-platform-latest/templates/operate/configmap.yaml
index b759ff9087..325fb03c00 100644
--- a/charts/camunda-platform-latest/templates/operate/configmap.yaml
+++ b/charts/camunda-platform-latest/templates/operate/configmap.yaml
@@ -94,6 +94,9 @@ data:
       {{- if .Values.global.opensearch.enabled }}
       opensearch:
         url: {{ include "camundaPlatform.opensearchURL" . | quote }}
+        {{- if .Values.global.opensearch.aws.enabled }}
+        awsEnabled: true
+        {{- end }}
         {{- if .Values.global.opensearch.auth.username }}
         username: {{ .Values.global.opensearch.auth.username | quote }}
         {{- end }}
diff --git a/charts/camunda-platform-latest/templates/optimize/deployment.yaml b/charts/camunda-platform-latest/templates/optimize/deployment.yaml
index d12283e33e..b1dfd28e03 100644
--- a/charts/camunda-platform-latest/templates/optimize/deployment.yaml
+++ b/charts/camunda-platform-latest/templates/optimize/deployment.yaml
@@ -79,6 +79,10 @@ spec:
             - name: OPTIMIZE_ELASTICSEARCH_HTTP_PORT
               value: {{ .Values.global.elasticsearch.url.port | quote }}
             {{- end }}
+            {{- if .Values.global.opensearch.aws.enabled }}
+            - name: CAMUNDA_OPTIMIZE_OPENSEARCH_AWS_ENABLED
+              value: "true"
+            {{- end }}
             {{- with .Values.optimize.migration.env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}
@@ -190,6 +194,10 @@ spec:
             - name: CAMUNDA_OPTIMIZE_CACHES_CLOUD_TENANT_AUTHORIZATIONS_MIN_FETCH_INTERVAL_SECONDS
               value: "600000"
             {{- end }}
+            {{- if .Values.global.opensearch.aws.enabled }}
+            - name: CAMUNDA_OPTIMIZE_OPENSEARCH_AWS_ENABLED
+              value: "true"
+            {{- end }}
           {{- with .Values.optimize.env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
diff --git a/charts/camunda-platform-latest/templates/tasklist/configmap.yaml b/charts/camunda-platform-latest/templates/tasklist/configmap.yaml
index 70c34d87a9..f310f74c70 100644
--- a/charts/camunda-platform-latest/templates/tasklist/configmap.yaml
+++ b/charts/camunda-platform-latest/templates/tasklist/configmap.yaml
@@ -95,6 +95,9 @@ data:
       database: opensearch
       opensearch:
         url: {{ include "camundaPlatform.opensearchURL" . | quote }}
+        {{- if .Values.global.opensearch.aws.enabled }}
+        awsEnabled: true
+        {{- end }}
         {{- if .Values.global.opensearch.auth.username }}
         username: {{ .Values.global.opensearch.auth.username | quote }}
         {{- end }}