diff --git a/charts/orkes-conductor/templates/deployment.yaml b/charts/orkes-conductor/templates/deployment.yaml
index e0d2be8..9b80458 100644
--- a/charts/orkes-conductor/templates/deployment.yaml
+++ b/charts/orkes-conductor/templates/deployment.yaml
@@ -251,14 +251,14 @@ spec:
               value: {{ .Values.secrets.ssmPath | quote }}
             {{- end }}
             #### Limits ####
-            - name: conductor.app.maxWorkflowSizeInMiB
-              value: {{ .Values.app.maxWorkflowSizeInMiB | quote }}
-            - name: conductor.app.maxTaskSizeInKiB
-              value: {{ .Values.app.maxTaskSizeInKiB | quote }}
-            - name: conductor.app.maxTaskInWorkflowExecution
-              value: {{ .Values.app.maxTaskInWorkflowExecution | quote }}
-            - name: conductor.app.maxTaskInWorkflowDefinition
-              value: {{ .Values.app.maxTaskInWorkflowDefinition | quote }}
+            - name: conductor.limits.maxWorkflowSizeInMiB
+              value: {{ .Values.app.limits.maxWorkflowSizeInMiB | quote }}
+            - name: conductor.limits.maxTaskSizeInKiB
+              value: {{ .Values.app.limits.maxTaskSizeInKiB | quote }}
+            - name: conductor.limits.maxTaskInWorkflowExecution
+              value: {{ .Values.app.limits.maxTaskInWorkflowExecution | quote }}
+            - name: conductor.limits.maxTaskInWorkflowDefinition
+              value: {{ .Values.app.limits.maxTaskInWorkflowDefinition | quote }}
             #### Others ####
             - name: conductor.swagger.url
               value: {{ .Values.app.swaggerUrl | quote }}
diff --git a/charts/orkes-conductor/values.yaml b/charts/orkes-conductor/values.yaml
index ead3fb6..2ded5e6 100644
--- a/charts/orkes-conductor/values.yaml
+++ b/charts/orkes-conductor/values.yaml
@@ -31,10 +31,11 @@ app:
   jvmSettings: "-Xms1500M -Xmx2500M"
   systemTaskMaxPollCount: "20"
   workflowExecutionLockEnabled: "true"
-  maxWorkflowSizeInMiB: "20"
-  maxTaskSizeInKiB: "200"
-  maxTaskInWorkflowExecution: "1000"
-  maxTaskInWorkflowDefinition: "1000"
+  limits:
+    maxWorkflowSizeInMiB: "20"
+    maxTaskSizeInKiB: "200"
+    maxTaskInWorkflowExecution: "1000"
+    maxTaskInWorkflowDefinition: "1000"
   apiRateLimiterEnabled: "true"
   # documentStoreS3BucketName: Required if archiveStoreType = s3
   documentStoreS3BucketName: