diff --git a/charts/orkes-conductor/templates/deployment.yaml b/charts/orkes-conductor/templates/deployment.yaml
index 8fc782b..fe5576f 100644
--- a/charts/orkes-conductor/templates/deployment.yaml
+++ b/charts/orkes-conductor/templates/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $securityEnabled := eq (toString .Values.security.enabled) "true" -}}
+{{- $clusterMode := eq (toString .Values.redis.clusterMode) "true" -}}
 {{- if $securityEnabled -}}
   {{- $validation := .Values.security.defaultUserEmail | required "security.defaultUserEmail is required." -}}
   {{- $validation := .Values.security.defaultUserName | required "security.defaultUserName is required." -}}
@@ -98,6 +99,12 @@ spec:
                 secretKeyRef:
                   name: orkesdeploymentsecrets
                   key: redisPassword
+            {{- if $clusterMode }}
+            - name: conductor.db.type
+              value: redis_cluster
+            - name: conductor.queue.type
+              value: redis_cluster
+            {{- end }}
             #### Postgres ####
             - name: spring.datasource.url
               value: {{ .Values.postgres.url | quote }}
diff --git a/charts/orkes-conductor/values.yaml b/charts/orkes-conductor/values.yaml
index d8ed00f..36ff9ae 100644
--- a/charts/orkes-conductor/values.yaml
+++ b/charts/orkes-conductor/values.yaml
@@ -76,6 +76,7 @@ redis:
   host:
   password:
   dbIndex: 0
+  clusterMode: false
 
 postgres:
   username: