diff --git a/test/unit/csi-daemonset.bats b/test/unit/csi-daemonset.bats
index 427bb2277..f3f222517 100644
--- a/test/unit/csi-daemonset.bats
+++ b/test/unit/csi-daemonset.bats
@@ -542,6 +542,7 @@ load _helpers
   cd `chart_dir`
   local actual=$(helm template \
       --show-only templates/csi-daemonset.yaml \
+      --set 'csi.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.hostNetwork' | tee /dev/stderr)
   [ "${actual}" = "false" ]
@@ -550,9 +551,10 @@ load _helpers
 @test "server/StatefulSet: server.hostNetwork is set" {
   cd `chart_dir`
   local actual=$(helm template \
-      --show-only templates/csi-daemonset.yaml \
-      --set 'csi.hostNetwork=true' \
-      . | tee /dev/stderr |
+        --show-only templates/csi-daemonset.yaml \
+        --set 'csi.enabled=true' \
+        --set 'csi.hostNetwork=true' \
+        . | tee /dev/stderr |
       yq -r '.spec.template.spec.hostNetwork' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 }
diff --git a/values.schema.json b/values.schema.json
index 35bd88140..cd5cfd9de 100644
--- a/values.schema.json
+++ b/values.schema.json
@@ -102,6 +102,9 @@
                 "hmacSecretName": {
                     "type": "string"
                 },
+                "hostNetwork": {
+                    "type": "boolean"
+                },
                 "image": {
                     "type": "object",
                     "properties": {
@@ -197,9 +200,6 @@
                 "resources": {
                     "type": "object"
                 },
-                "hostNetwork": {
-                    "type": "boolean"
-                },
                 "serviceAccount": {
                     "type": "object",
                     "properties": {
diff --git a/values.yaml b/values.yaml
index 0a08b3401..d09eebc03 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1119,7 +1119,7 @@ csi:
   # generating secret versions.
   hmacSecretName: ""
 
-  #Allow modification of the hostNetwork parameter to avoid the need of a dedicated pod ip
+  # Allow modification of the hostNetwork parameter to avoid the need of a dedicated pod ip
   hostNetwork: false
 
   # Settings for the daemonSet used to run the provider.