diff --git a/aws-ebs-csi-driver/templates/deployment.yaml b/aws-ebs-csi-driver/templates/deployment.yaml
index d494510b61..7f0a5d41eb 100644
--- a/aws-ebs-csi-driver/templates/deployment.yaml
+++ b/aws-ebs-csi-driver/templates/deployment.yaml
@@ -22,10 +22,11 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
     spec:
-      {{- with .Values.nodeSelector }}
       nodeSelector:
+        beta.kubernetes.io/os: linux
+        {{- with .Values.nodeSelector }}
 {{ toYaml . | indent 8 }}
-      {{- end }}
+        {{- end }}
       serviceAccountName: ebs-csi-controller-sa
       priorityClassName: system-cluster-critical
       {{- with .Values.affinity }}
diff --git a/aws-ebs-csi-driver/values.yaml b/aws-ebs-csi-driver/values.yaml
index 4ff627f767..dcf2463f7e 100644
--- a/aws-ebs-csi-driver/values.yaml
+++ b/aws-ebs-csi-driver/values.yaml
@@ -36,8 +36,7 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-nodeSelector:
-  beta.kubernetes.io/os: linux
+nodeSelector: {}
 
 tolerations: []