diff --git a/charts/aws-fsx-csi-driver/templates/controller-deployment.yaml b/charts/aws-fsx-csi-driver/templates/controller-deployment.yaml
index 64707a63..b93214ce 100644
--- a/charts/aws-fsx-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-fsx-csi-driver/templates/controller-deployment.yaml
@@ -19,6 +19,9 @@ spec:
       labels:
         app: fsx-csi-controller
         {{- include "aws-fsx-csi-driver.labels" . | nindent 8 }}
+        {{- if .Values.controller.podLabels }}
+          {{- toYaml .Values.controller.podLabels | nindent 8 }}
+        {{- end }}
     spec:
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -96,7 +99,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --v={{ .Values.sidecars.provisioner.logLevel }}
-            - --timeout=5m
+            - --timeout={{ .Values.controller.timeout| default "5m" }}
             - --extra-create-metadata
             - --leader-election=true
           env:
diff --git a/charts/aws-fsx-csi-driver/templates/node-daemonset.yaml b/charts/aws-fsx-csi-driver/templates/node-daemonset.yaml
index 6bb238b6..01ae67f2 100644
--- a/charts/aws-fsx-csi-driver/templates/node-daemonset.yaml
+++ b/charts/aws-fsx-csi-driver/templates/node-daemonset.yaml
@@ -22,6 +22,9 @@ spec:
       labels:
         app: fsx-csi-node
         {{- include "aws-fsx-csi-driver.labels" . | nindent 8 }}
+        {{- if .Values.node.podLabels }}
+          {{- toYaml .Values.node.podLabels | nindent 8 }}
+        {{- end }}
     spec:
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/charts/aws-fsx-csi-driver/values.yaml b/charts/aws-fsx-csi-driver/values.yaml
index 0e949a04..6ccecc51 100644
--- a/charts/aws-fsx-csi-driver/values.yaml
+++ b/charts/aws-fsx-csi-driver/values.yaml
@@ -103,6 +103,8 @@ controller:
     - effect: NoExecute
       operator: Exists
       tolerationSeconds: 300
+  # Specify the timeout of all calls to the CSI driver.
+  timeout: 5m
   # securityContext on the controller pod
   securityContext:
     runAsNonRoot: false
@@ -126,6 +128,7 @@ controller:
                 values:
                   - fargate
                   - hybrid
+  podLabels: {}
   # topologySpreadConstraints:
   #  - maxSkew: 1
   #    topologyKey: topology.kubernetes.io/zone
@@ -200,6 +203,7 @@ node:
             values:
             - fargate
             - hybrid
+  podLabels: {}
 
 nameOverride: ""
 fullnameOverride: ""