diff --git a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2 b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
index 8ff8f6daf2066ae79291aa2953f876f324ded921..97be182c29e93df6752eb42436130c938a9008b6 100644
--- a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
@@ -91,6 +91,7 @@ spec:
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=kube-system"
+            - "--supervisor-fss-namespace=kube-system"
             - "--use-gocsi=false"
           imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
@@ -150,6 +151,7 @@ spec:
             - "--leader-election"
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=kube-system"
+            - "--supervisor-fss-namespace=kube-system"
           imagePullPolicy: {{ k8s_image_pull_policy }}
           ports:
             - containerPort: 2113
diff --git a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2 b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
index 1b55d629a0b08229742da8ee4b05d0502a2c91d0..322267199c4bb90e9fb4fe34aa8c33b960102089 100644
--- a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
@@ -58,6 +58,7 @@ spec:
         args:
           - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
           - "--fss-namespace=kube-system"
+          - "--supervisor-fss-namespace=kube-system"
           - "--use-gocsi=false"
         imagePullPolicy: "Always"
         env: