diff --git a/charts/aws-ebs-csi-driver/templates/_node-windows.tpl b/charts/aws-ebs-csi-driver/templates/_node-windows.tpl
new file mode 100644
index 0000000000..1517d183a9
--- /dev/null
+++ b/charts/aws-ebs-csi-driver/templates/_node-windows.tpl
@@ -0,0 +1,190 @@
+{{- define "node-windows" }}
+{{- if .Node.enableWindows }}
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: {{ .Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app: ebs-csi-node
+      {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }}
+  updateStrategy:
+    {{ toYaml .Node.updateStrategy | nindent 4 }}
+  template:
+    metadata:
+      labels:
+        app: ebs-csi-node
+        {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
+        {{- if .Node.podLabels }}
+        {{- toYaml .Node.podLabels | nindent 8 }}
+        {{- end }}
+      {{- with .Node.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- with .Node.affinity }}
+      affinity: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: windows
+        {{- with .Node.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      serviceAccountName: {{ .Node.serviceAccount.name }}
+      priorityClassName: {{ .Node.priorityClassName | default "system-node-critical" }}
+      tolerations:
+        {{- if .Node.tolerateAllTaints }}
+        - operator: Exists
+        {{- else }}
+        {{- with .Node.tolerations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- end }}
+      containers:
+        - name: ebs-plugin
+          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.image.repository (default (printf "v%s" .Chart.AppVersion) (toString .Values.image.tag)) }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args:
+            - node
+            - --endpoint=$(CSI_ENDPOINT)
+            {{- with .Node.volumeAttachLimit }}
+            - --volume-attach-limit={{ . }}
+            {{- end }}
+            {{- with .Node.loggingFormat }}
+            - --logging-format={{ . }}
+            {{- end }}
+            - --v={{ .Node.logLevel }}
+          env:
+            - name: CSI_ENDPOINT
+              value: unix:/csi/csi.sock
+            - name: CSI_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            {{- if .Values.proxy.http_proxy }}
+            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
+            {{- end }}
+            {{- with .Node.env }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+          volumeMounts:
+            - name: kubelet-dir
+              mountPath: C:\var\lib\kubelet
+              mountPropagation: "None"
+            - name: plugin-dir
+              mountPath: C:\csi
+            - name: csi-proxy-disk-pipe
+              mountPath: \\.\pipe\csi-proxy-disk-v1
+            - name: csi-proxy-volume-pipe
+              mountPath: \\.\pipe\csi-proxy-volume-v1
+            - name: csi-proxy-filesystem-pipe
+              mountPath: \\.\pipe\csi-proxy-filesystem-v1
+          ports:
+            - name: healthz
+              containerPort: 9808
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 10
+            timeoutSeconds: 3
+            periodSeconds: 10
+            failureThreshold: 5
+          {{- with .Node.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          securityContext:
+            windowsOptions:
+              runAsUserName: "ContainerAdministrator"
+        - name: node-driver-registrar
+          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }}
+          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.nodeDriverRegistrar.image.pullPolicy }}
+          args:
+            - --csi-address=$(ADDRESS)
+            - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
+            - --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }}
+          env:
+            - name: ADDRESS
+              value: unix:/csi/csi.sock
+            - name: DRIVER_REG_SOCK_PATH
+              value: C:\var\lib\kubelet\plugins\ebs.csi.aws.com\csi.sock
+            {{- if .Values.proxy.http_proxy }}
+            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
+            {{- end }}
+            {{- with .Values.sidecars.nodeDriverRegistrar.env }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+          livenessProbe:
+            exec:
+              command:
+                - /csi-node-driver-registrar.exe
+                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
+                - --mode=kubelet-registration-probe
+            initialDelaySeconds: 30
+            timeoutSeconds: 15
+            periodSeconds: 90
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: C:\csi
+            - name: registration-dir
+              mountPath: C:\registration
+            - name: probe-dir
+              mountPath: C:\var\lib\kubelet\plugins\ebs.csi.aws.com
+          {{- with default .Node.resources .Values.sidecars.nodeDriverRegistrar.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        - name: liveness-probe
+          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
+          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.livenessProbe.image.pullPolicy }}
+          args:
+            - --csi-address=unix:/csi/csi.sock
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: C:\csi
+          {{- with default .Node.resources .Values.sidecars.livenessProbe.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.imagePullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      volumes:
+        - name: kubelet-dir
+          hostPath:
+            path: C:\var\lib\kubelet
+            type: Directory
+        - name: plugin-dir
+          hostPath:
+            path: C:\var\lib\kubelet\plugins\ebs.csi.aws.com
+            type: DirectoryOrCreate
+        - name: registration-dir
+          hostPath:
+            path: C:\var\lib\kubelet\plugins_registry
+            type: Directory
+        - name: csi-proxy-disk-pipe
+          hostPath:
+            path: \\.\pipe\csi-proxy-disk-v1
+            type: ""
+        - name: csi-proxy-volume-pipe
+          hostPath:
+            path: \\.\pipe\csi-proxy-volume-v1
+            type: ""
+        - name: csi-proxy-filesystem-pipe
+          hostPath:
+            path: \\.\pipe\csi-proxy-filesystem-v1
+            type: ""
+        - name: probe-dir
+          emptyDir: {}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/aws-ebs-csi-driver/templates/_node.tpl b/charts/aws-ebs-csi-driver/templates/_node.tpl
new file mode 100644
index 0000000000..cd0e35dbda
--- /dev/null
+++ b/charts/aws-ebs-csi-driver/templates/_node.tpl
@@ -0,0 +1,215 @@
+{{- define "node" }}
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: {{ .Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app: ebs-csi-node
+      {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }}
+  updateStrategy:
+    {{- toYaml .Node.updateStrategy | nindent 4 }}
+  template:
+    metadata:
+      labels:
+        app: ebs-csi-node
+        {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
+        {{- if .Node.podLabels }}
+        {{- toYaml .Node.podLabels | nindent 8 }}
+        {{- end }}
+      {{- with .Node.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- with .Node.affinity }}
+      affinity: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{- with .Node.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      serviceAccountName: {{ .Node.serviceAccount.name }}
+      priorityClassName: {{ .Node.priorityClassName | default "system-node-critical" }}
+      tolerations:
+        {{- if .Node.tolerateAllTaints }}
+        - operator: Exists
+        {{- else }}
+        {{- with .Node.tolerations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        - key: "ebs.csi.aws.com/agent-not-ready"
+          operator: "Exists"
+        {{- end }}
+      {{- with .Node.securityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: ebs-plugin
+          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.image.repository (default (printf "v%s" .Chart.AppVersion) (toString .Values.image.tag)) }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args:
+            - node
+            - --endpoint=$(CSI_ENDPOINT)
+            {{- with .Node.volumeAttachLimit }}
+            - --volume-attach-limit={{ . }}
+            {{- end }}
+            {{- with .Node.loggingFormat }}
+            - --logging-format={{ . }}
+            {{- end }}
+            - --v={{ .Node.logLevel }}
+          env:
+            - name: CSI_ENDPOINT
+              value: unix:/csi/csi.sock
+            - name: CSI_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            {{- if .Values.proxy.http_proxy }}
+            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
+            {{- end }}
+            {{- with .Node.env }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+          {{- with .Values.controller.envFrom }}
+          envFrom:
+            {{- . | toYaml | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: kubelet-dir
+              mountPath: {{ .Node.kubeletPath }}
+              mountPropagation: "Bidirectional"
+            - name: plugin-dir
+              mountPath: /csi
+            - name: device-dir
+              mountPath: /dev
+          {{- with .Node.volumeMounts }}
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
+          ports:
+            - name: healthz
+              containerPort: 9808
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 10
+            timeoutSeconds: 3
+            periodSeconds: 10
+            failureThreshold: 5
+          {{- with .Node.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Node.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        - name: node-driver-registrar
+          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }}
+          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.nodeDriverRegistrar.image.pullPolicy }}
+          args:
+            - --csi-address=$(ADDRESS)
+            - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
+            - --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }}
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+            - name: DRIVER_REG_SOCK_PATH
+              value: {{ printf "%s/plugins/ebs.csi.aws.com/csi.sock" (trimSuffix "/" .Node.kubeletPath) }}
+            {{- if .Values.proxy.http_proxy }}
+            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
+            {{- end }}
+            {{- with .Values.sidecars.nodeDriverRegistrar.env }}
+            {{- . | toYaml | nindent 12 }}
+            {{- end }}
+            {{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }}
+            - {{ . }}
+            {{- end }}
+          {{- with .Values.controller.envFrom }}
+          envFrom:
+            {{- . | toYaml | nindent 12 }}
+          {{- end }}
+          livenessProbe:
+            exec:
+              command:
+                - /csi-node-driver-registrar
+                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
+                - --mode=kubelet-registration-probe
+            initialDelaySeconds: 30
+            timeoutSeconds: 15
+            periodSeconds: 90
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
+            - name: registration-dir
+              mountPath: /registration
+            - name: probe-dir
+              mountPath: {{ printf "%s/plugins/ebs.csi.aws.com/" (trimSuffix "/" .Node.kubeletPath) }}
+          {{- with default .Node.resources .Values.sidecars.nodeDriverRegistrar.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.sidecars.nodeDriverRegistrar.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        - name: liveness-probe
+          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
+          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.livenessProbe.image.pullPolicy }}
+          args:
+            - --csi-address=/csi/csi.sock
+            {{- range .Values.sidecars.livenessProbe.additionalArgs }}
+            - {{ . }}
+            {{- end }}
+          {{- with .Values.controller.envFrom }}
+          envFrom:
+            {{- . | toYaml | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
+          {{- with default .Node.resources .Values.sidecars.livenessProbe.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.sidecars.livenessProbe.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.imagePullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      volumes:
+        - name: kubelet-dir
+          hostPath:
+            path: {{ .Node.kubeletPath }}
+            type: Directory
+        - name: plugin-dir
+          hostPath:
+            path: {{ printf "%s/plugins/ebs.csi.aws.com/" (trimSuffix "/" .Node.kubeletPath) }}
+            type: DirectoryOrCreate
+        - name: registration-dir
+          hostPath:
+            path: {{ printf "%s/plugins_registry/" (trimSuffix "/" .Node.kubeletPath) }}
+            type: Directory
+        - name: device-dir
+          hostPath:
+            path: /dev
+            type: Directory
+        - name: probe-dir
+          emptyDir: {}
+        {{- with .Node.volumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/aws-ebs-csi-driver/templates/node-windows.yaml b/charts/aws-ebs-csi-driver/templates/node-windows.yaml
index 3f460563d3..9bd8d95947 100644
--- a/charts/aws-ebs-csi-driver/templates/node-windows.yaml
+++ b/charts/aws-ebs-csi-driver/templates/node-windows.yaml
@@ -1,188 +1,19 @@
-{{- if .Values.node.enableWindows }}
-kind: DaemonSet
-apiVersion: apps/v1
-metadata:
-  name: ebs-csi-node-windows
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
-spec:
-  selector:
-    matchLabels:
-      app: ebs-csi-node
-      {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }}
-  updateStrategy:
-    {{ toYaml .Values.node.updateStrategy | nindent 4 }}
-  template:
-    metadata:
-      labels:
-        app: ebs-csi-node
-        {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
-        {{- if .Values.node.podLabels }}
-        {{- toYaml .Values.node.podLabels | nindent 8 }}
-        {{- end }}
-      {{- with .Values.node.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      {{- with .Values.node.affinity }}
-      affinity: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      nodeSelector:
-        kubernetes.io/os: windows
-        {{- with .Values.node.nodeSelector }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      serviceAccountName: {{ .Values.node.serviceAccount.name }}
-      priorityClassName: {{ .Values.node.priorityClassName | default "system-node-critical" }}
-      tolerations:
-        {{- if .Values.node.tolerateAllTaints }}
-        - operator: Exists
-        {{- else }}
-        {{- with .Values.node.tolerations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- end }}
-      containers:
-        - name: ebs-plugin
-          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.image.repository (default (printf "v%s" .Chart.AppVersion) (toString .Values.image.tag)) }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args:
-            - node
-            - --endpoint=$(CSI_ENDPOINT)
-            {{- with .Values.node.volumeAttachLimit }}
-            - --volume-attach-limit={{ . }}
-            {{- end }}
-            {{- with .Values.node.loggingFormat }}
-            - --logging-format={{ . }}
-            {{- end }}
-            - --v={{ .Values.node.logLevel }}
-          env:
-            - name: CSI_ENDPOINT
-              value: unix:/csi/csi.sock
-            - name: CSI_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            {{- if .Values.proxy.http_proxy }}
-            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
-            {{- end }}
-            {{- with .Values.node.env }}
-            {{- . | toYaml | nindent 12 }}
-            {{- end }}
-          volumeMounts:
-            - name: kubelet-dir
-              mountPath: C:\var\lib\kubelet
-              mountPropagation: "None"
-            - name: plugin-dir
-              mountPath: C:\csi
-            - name: csi-proxy-disk-pipe
-              mountPath: \\.\pipe\csi-proxy-disk-v1
-            - name: csi-proxy-volume-pipe
-              mountPath: \\.\pipe\csi-proxy-volume-v1
-            - name: csi-proxy-filesystem-pipe
-              mountPath: \\.\pipe\csi-proxy-filesystem-v1
-          ports:
-            - name: healthz
-              containerPort: 9808
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: healthz
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-            periodSeconds: 10
-            failureThreshold: 5
-          {{- with .Values.node.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          securityContext:
-            windowsOptions:
-              runAsUserName: "ContainerAdministrator"
-        - name: node-driver-registrar
-          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }}
-          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.nodeDriverRegistrar.image.pullPolicy }}
-          args:
-            - --csi-address=$(ADDRESS)
-            - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }}
-          env:
-            - name: ADDRESS
-              value: unix:/csi/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: C:\var\lib\kubelet\plugins\ebs.csi.aws.com\csi.sock
-            {{- if .Values.proxy.http_proxy }}
-            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
-            {{- end }}
-            {{- with .Values.sidecars.nodeDriverRegistrar.env }}
-            {{- . | toYaml | nindent 12 }}
-            {{- end }}
-          livenessProbe:
-            exec:
-              command:
-                - /csi-node-driver-registrar.exe
-                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-                - --mode=kubelet-registration-probe
-            initialDelaySeconds: 30
-            timeoutSeconds: 15
-            periodSeconds: 90
-          volumeMounts:
-            - name: plugin-dir
-              mountPath: C:\csi
-            - name: registration-dir
-              mountPath: C:\registration
-            - name: probe-dir
-              mountPath: C:\var\lib\kubelet\plugins\ebs.csi.aws.com
-          {{- with default .Values.node.resources .Values.sidecars.nodeDriverRegistrar.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-        - name: liveness-probe
-          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
-          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.livenessProbe.image.pullPolicy }}
-          args:
-            - --csi-address=unix:/csi/csi.sock
-          volumeMounts:
-            - name: plugin-dir
-              mountPath: C:\csi
-          {{- with default .Values.node.resources .Values.sidecars.livenessProbe.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      volumes:
-        - name: kubelet-dir
-          hostPath:
-            path: C:\var\lib\kubelet
-            type: Directory
-        - name: plugin-dir
-          hostPath:
-            path: C:\var\lib\kubelet\plugins\ebs.csi.aws.com
-            type: DirectoryOrCreate
-        - name: registration-dir
-          hostPath:
-            path: C:\var\lib\kubelet\plugins_registry
-            type: Directory
-        - name: csi-proxy-disk-pipe
-          hostPath:
-            path: \\.\pipe\csi-proxy-disk-v1
-            type: ""
-        - name: csi-proxy-volume-pipe
-          hostPath:
-            path: \\.\pipe\csi-proxy-volume-v1
-            type: ""
-        - name: csi-proxy-filesystem-pipe
-          hostPath:
-            path: \\.\pipe\csi-proxy-filesystem-v1
-            type: ""
-        - name: probe-dir
-          emptyDir: {}
-{{- end }}
+{{$defaultArgs := dict
+  "Chart" .Chart
+  "Release" .Release
+  "Values" .Values
+  "Node" .Values.node
+  "Name" "ebs-csi-node-windows"
+}}
+{{- include "node-windows" $defaultArgs -}}
+
+{{- range $k, $v := .Values.additionalDaemonSets }}
+{{$args := dict
+  "Chart" $.Chart
+  "Release" $.Release
+  "Values" $.Values
+  "Node" (deepCopy $.Values.node | mustMerge $v)
+  "Name" (printf "ebs-csi-node-windows-%s" $k)
+}}
+{{- include "node-windows" $args -}}
+{{- end}}
\ No newline at end of file
diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
index 9e24c102af..df47181355 100644
--- a/charts/aws-ebs-csi-driver/templates/node.yaml
+++ b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -1,214 +1,19 @@
-# Node Service
-kind: DaemonSet
-apiVersion: apps/v1
-metadata:
-  name: ebs-csi-node
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
-spec:
-  selector:
-    matchLabels:
-      app: ebs-csi-node
-      {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }}
-  updateStrategy:
-    {{- toYaml .Values.node.updateStrategy | nindent 4 }}
-  template:
-    metadata:
-      labels:
-        app: ebs-csi-node
-        {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
-        {{- if .Values.node.podLabels }}
-        {{- toYaml .Values.node.podLabels | nindent 8 }}
-        {{- end }}
-      {{- with .Values.node.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      {{- with .Values.node.affinity }}
-      affinity: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      nodeSelector:
-        kubernetes.io/os: linux
-        {{- with .Values.node.nodeSelector }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      serviceAccountName: {{ .Values.node.serviceAccount.name }}
-      priorityClassName: {{ .Values.node.priorityClassName | default "system-node-critical" }}
-      tolerations:
-        {{- if .Values.node.tolerateAllTaints }}
-        - operator: Exists
-        {{- else }}
-        {{- with .Values.node.tolerations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        - key: "ebs.csi.aws.com/agent-not-ready"
-          operator: "Exists"
-        {{- end }}
-      {{- with .Values.node.securityContext }}
-      securityContext:  
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: ebs-plugin
-          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.image.repository (default (printf "v%s" .Chart.AppVersion) (toString .Values.image.tag)) }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args:
-            - node
-            - --endpoint=$(CSI_ENDPOINT)
-            {{- with .Values.node.volumeAttachLimit }}
-            - --volume-attach-limit={{ . }}
-            {{- end }}
-            {{- with .Values.node.loggingFormat }}
-            - --logging-format={{ . }}
-            {{- end }}
-            - --v={{ .Values.node.logLevel }}
-          env:
-            - name: CSI_ENDPOINT
-              value: unix:/csi/csi.sock
-            - name: CSI_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            {{- if .Values.proxy.http_proxy }}
-            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
-            {{- end }}
-            {{- with .Values.node.env }}
-            {{- . | toYaml | nindent 12 }}
-            {{- end }}
-          {{- with .Values.controller.envFrom }}
-          envFrom:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            - name: kubelet-dir
-              mountPath: {{ .Values.node.kubeletPath }}
-              mountPropagation: "Bidirectional"
-            - name: plugin-dir
-              mountPath: /csi
-            - name: device-dir
-              mountPath: /dev
-          {{- with .Values.node.volumeMounts }}
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
-          ports:
-            - name: healthz
-              containerPort: 9808
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: healthz
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-            periodSeconds: 10
-            failureThreshold: 5
-          {{- with .Values.node.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.node.containerSecurityContext }}
-          securityContext:  
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-        - name: node-driver-registrar
-          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }}
-          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.nodeDriverRegistrar.image.pullPolicy }}
-          args:
-            - --csi-address=$(ADDRESS)
-            - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }}
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: {{ printf "%s/plugins/ebs.csi.aws.com/csi.sock" (trimSuffix "/" .Values.node.kubeletPath) }}
-            {{- if .Values.proxy.http_proxy }}
-            {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
-            {{- end }}
-            {{- with .Values.sidecars.nodeDriverRegistrar.env }}
-            {{- . | toYaml | nindent 12 }}
-            {{- end }}
-            {{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }}
-            - {{ . }}
-            {{- end }}
-          {{- with .Values.controller.envFrom }}
-          envFrom:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-          livenessProbe:
-            exec:
-              command:
-                - /csi-node-driver-registrar
-                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-                - --mode=kubelet-registration-probe
-            initialDelaySeconds: 30
-            timeoutSeconds: 15
-            periodSeconds: 90
-          volumeMounts:
-            - name: plugin-dir
-              mountPath: /csi
-            - name: registration-dir
-              mountPath: /registration
-            - name: probe-dir
-              mountPath: {{ printf "%s/plugins/ebs.csi.aws.com/" (trimSuffix "/" .Values.node.kubeletPath) }}
-          {{- with default .Values.node.resources .Values.sidecars.nodeDriverRegistrar.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.sidecars.nodeDriverRegistrar.securityContext }}
-          securityContext:  
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-        - name: liveness-probe
-          image: {{ printf "%s%s:%s" (default "" .Values.image.containerRegistry) .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
-          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.livenessProbe.image.pullPolicy }}
-          args:
-            - --csi-address=/csi/csi.sock
-            {{- range .Values.sidecars.livenessProbe.additionalArgs }}
-            - {{ . }}
-            {{- end }}
-          {{- with .Values.controller.envFrom }}
-          envFrom:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            - name: plugin-dir
-              mountPath: /csi
-          {{- with default .Values.node.resources .Values.sidecars.livenessProbe.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.sidecars.livenessProbe.securityContext }}
-          securityContext:  
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      volumes:
-        - name: kubelet-dir
-          hostPath:
-            path: {{ .Values.node.kubeletPath }}
-            type: Directory
-        - name: plugin-dir
-          hostPath:
-            path: {{ printf "%s/plugins/ebs.csi.aws.com/" (trimSuffix "/" .Values.node.kubeletPath) }}
-            type: DirectoryOrCreate
-        - name: registration-dir
-          hostPath:
-            path: {{ printf "%s/plugins_registry/" (trimSuffix "/" .Values.node.kubeletPath) }}
-            type: Directory
-        - name: device-dir
-          hostPath:
-            path: /dev
-            type: Directory
-        - name: probe-dir
-          emptyDir: {}
-        {{- with .Values.node.volumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+{{$defaultArgs := dict
+  "Chart" .Chart
+  "Release" .Release
+  "Values" .Values
+  "Node" .Values.node
+  "Name" "ebs-csi-node"
+}}
+{{- include "node" $defaultArgs -}}
+
+{{- range $k, $v := .Values.additionalDaemonSets }}
+{{$args := dict
+  "Chart" $.Chart
+  "Release" $.Release
+  "Values" $.Values
+  "Node" (deepCopy $.Values.node | mustMerge $v)
+  "Name" (printf "ebs-csi-node-%s" $k)
+}}
+{{- include "node" $args -}}
+{{- end}}
\ No newline at end of file
diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
index 7197097b0c..b9b7359b8d 100644
--- a/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/aws-ebs-csi-driver/values.yaml
@@ -355,6 +355,15 @@ node:
     readOnlyRootFilesystem: true
     privileged: true
 
+additionalDaemonSets:
+  # Additional node DaemonSets, using the node config structure
+  # See docs/additional-daemonsets.md for more information
+  #
+  # example:
+  #   nodeSelector:
+  #     node.kubernetes.io/instance-type: c5.large
+  #   volumeAttachLimit: 15
+
 storageClasses: []
 # Add StorageClass resources like:
 # - name: ebs-sc
diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
index 5611637ddc..f782fcb546 100644
--- a/deploy/kubernetes/base/node.yaml
+++ b/deploy/kubernetes/base/node.yaml
@@ -1,6 +1,5 @@
 ---
 # Source: aws-ebs-csi-driver/templates/node.yaml
-# Node Service
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
diff --git a/docs/additional-daemonsets.md b/docs/additional-daemonsets.md
new file mode 100644
index 0000000000..2327666bd3
--- /dev/null
+++ b/docs/additional-daemonsets.md
@@ -0,0 +1,44 @@
+# Additional Node DaemonSets Feature
+
+In some situations, it is desirable to create multiple node `DaemonSet`s of the EBS CSI Driver. For example, when specifying `.node.volumeAttachLimit`, the limit may differ by node instance type or role.
+
+The EBS CSI Driver Helm chart supports the creation of additional `DaemonSet`s via the `.additionalDaemonSets` parameter. Node configuration from the values supplied to `.node` are taken as a default, with the vlaues supplied in the `.additionalDaemonSets` configuration overriding the defaults. A Linux (and Windows, if enabled) `DaemonSet` will be rendered for each entry in `additionalDaemonSets`.
+
+**WARNING: The EBS CSI Driver does not support running multiple node pods on the same node. If you use this feature, ensure that all nodes are targeted by exactly 1 or 0 `DaemonSet`s.**
+
+## Example
+
+For example, the following configuration would produce three `DaemonSet`s:
+
+```yaml
+node:
+  nodeSelector:
+    node.kubernetes.io/instance-type: c5.large
+  volumeAttachLimit: 25
+  resources:
+    limits:
+      memory: 512Mi
+  
+additionalNodeDaemonSets:
+  big:
+    nodeSelector:
+      node.kubernetes.io/instance-type: m7i.48xlarge
+    volumeAttachLimit: 100
+  small:
+    nodeSelector:
+      node.kubernetes.io/instance-type: t3.medium
+    volumeAttachLimit: 5
+    resources:
+      limits:
+        memory: 128Mi
+```
+
+The `DaemonSet`s would be configured as follows:
+
+- `ebs-csi-node` (the default `DaemonSet`)  
+Runs on `c5.large` instances with a volume limit of 25 and 512Mi memory limit.
+- `ebs-csi-node-big`  
+Runs on `m7i.48xlarge` instances with a volume limit of 100 and 512Mi memory limit.  
+Note how the volume limit is inherited from the `.node` configuration because this config does not specify them. This way, `.node` can be used to set defaults for all the `DaemonSet`s.
+- `ebs-csi-node-small`  
+Runs on `t3.medium` instances with a volume limit of 5 and 128Mi memory limit.
\ No newline at end of file