diff --git a/helm-chart/csi-driver/templates/csi-linode-controller.yaml b/helm-chart/csi-driver/templates/csi-linode-controller.yaml
index d70e88bb..21a7162f 100644
--- a/helm-chart/csi-driver/templates/csi-linode-controller.yaml
+++ b/helm-chart/csi-driver/templates/csi-linode-controller.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controller.enabled }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -196,3 +197,4 @@ spec:
         {{- with .Values.csiLinodePlugin.volumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+{{- end }}
diff --git a/helm-chart/csi-driver/templates/daemonset.yaml b/helm-chart/csi-driver/templates/daemonset.yaml
index b1a83504..ecb12661 100644
--- a/helm-chart/csi-driver/templates/daemonset.yaml
+++ b/helm-chart/csi-driver/templates/daemonset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.daemonSet.enabled }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -154,3 +155,4 @@ spec:
       {{- with .Values.csiLinodePlugin.volumes }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
+{{- end }}
diff --git a/helm-chart/csi-driver/values.yaml b/helm-chart/csi-driver/values.yaml
index 39e47f85..dc58b96c 100644
--- a/helm-chart/csi-driver/values.yaml
+++ b/helm-chart/csi-driver/values.yaml
@@ -96,10 +96,13 @@ csiNodeDriverRegistrar:
   volumeMounts: []
 
 controller:
+  enabled: true
   nodeSelector: {}
   affinity: {}
   tolerations: []
 
+daemonSet:
+  enabled: true
 # Add custom annotations to all pods
 podAnnotations: {}