diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
index 573e9e33f..63a3046ec 100644
--- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -143,15 +143,34 @@ spec:
             {{- if hasKey .Values.controller "timeout" }}
             - --timeout={{ .Values.controller.timeout }}
             {{- end }}
+            {{- if hasKey .Values.controller "workerThreads" }}
+            - --worker-threads={{ .Values.controller.workerThreads }}
+            {{- end }}
+            {{- if hasKey .Values.controller "timeout" }}
+            - --timeout={{ .Values.controller.timeout }}
+            {{- end }}
+            {{- if .Values.controller.metrics.enabled }}
+            - --metrics-address=:{{ .Values.controller.metrics.port }}
+            - --metrics-path={{ .Values.controller.metrics.path }}
+            {{- end }}
+            {{- if .Values.sidecars.csiProvisioner.additionalArgs }}
             {{- range .Values.sidecars.csiProvisioner.additionalArgs }}
             - {{ . }}
             {{- end }}
+            {{- end }}
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
+          {{- if .Values.controller.metrics.enabled }}
+          ports:
+            - name: metrics
+              containerPort: {{ .Values.controller.metrics.port }}
+              protocol: TCP
+          {{- end }}
+          {{- with .Values.sidecars.csiProvisioner.resources }}
           {{- with default .Values.controller.resources .Values.sidecars.csiProvisioner.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index 0029b93d4..0f95188b6 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -124,6 +124,12 @@ controller:
     privileged: true
   leaderElectionRenewDeadline: 10s
   leaderElectionLeaseDuration: 15s
+  # Enable metrics for csi-provisioner
+  metrics:
+    enabled: false
+    port: 8080
+    path: /metrics
+    
   # Timeout for Create/DeleteVolume calls to Controller. We recommend increasing for high concurrency workloads
   timeout: 15s
   # Number of concurrent threads controller will handle at once.