diff --git a/test/unit/csi-daemonset.bats b/test/unit/csi-daemonset.bats
index 97bc86d..e1fd0ef 100644
--- a/test/unit/csi-daemonset.bats
+++ b/test/unit/csi-daemonset.bats
@@ -373,9 +373,9 @@ load _helpers
   local actual=$(helm template \
       --show-only templates/csi-daemonset.yaml  \
       --set 'csi.enabled=true' \
-      --set "csi.pod.nodeSelector[0].foo=bar,csi.pod.nodeSelector[1].baz=qux" \
+      --set "csi.pod.nodeSelector.foo=bar,csi.pod.nodeSelector.baz=qux" \
       . | tee /dev/stderr |
-      yq '.spec.template.spec.nodeSelector[0].foo == "bar" and .spec.template.spec.nodeSelector[1].baz == "qux"' | tee /dev/stderr)
+      yq '.spec.template.spec.nodeSelector.foo == "bar" and .spec.template.spec.nodeSelector.baz == "qux"' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 }
 
@@ -830,4 +830,4 @@ load _helpers
   local value=$(echo $object |
       yq -r '.limits.cpu' | tee /dev/stderr)
   [ "${value}" = "500m" ]
-}
\ No newline at end of file
+}
diff --git a/values.schema.json b/values.schema.json
index 7a7643b..ecb97de 100644
--- a/values.schema.json
+++ b/values.schema.json
@@ -139,7 +139,7 @@
                         "affinity": {
                             "type": [
                               "null",
-                              "array",
+                              "object",
                               "string"
                             ]
                         },
@@ -155,7 +155,7 @@
                         "nodeSelector": {
                             "type": [
                               "null",
-                              "array",
+                              "object",
                               "string"
                             ]
                         },
diff --git a/values.yaml b/values.yaml
index d80a043..15852c8 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1070,7 +1070,7 @@ csi:
     # Example:
     # nodeSelector:
     #   beta.kubernetes.io/arch: amd64
-    nodeSelector: []
+    nodeSelector: {}
 
     # Affinity Settings
     # This should be either a multi-line string or YAML matching the PodSpec's affinity field.