diff --git a/Makefile b/Makefile
index 149e3b9490..797690a497 100755
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ ifdef KUBERNETES_VERSION # disable kubelet-registration-probe on capz cluster te
 E2E_HELM_OPTIONS += --set linux.enableRegistrationProbe=false --set windows.enableRegistrationProbe=false
 endif
 ifdef EXTERNAL_E2E_TEST_NFS
-E2E_HELM_OPTIONS += --set feature.enableVolumeMountGroup=false
+E2E_HELM_OPTIONS += --set feature.enableVolumeMountGroup=false --set feature.fsGroupPolicy=File
 endif
 GINKGO_FLAGS = -ginkgo.v
 GO111MODULE = on
diff --git a/charts/README.md b/charts/README.md
index af3e0c9edf..090d4f4d74 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -53,6 +53,7 @@ The following table lists the configurable parameters of the latest Azure File C
 | `driver.azureGoSDKLogLevel`                       | [Azure go sdk log level](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/previous-versions-quickstart.md#built-in-basic-requestresponse-logging)  | ``(no logs), `DEBUG`, `INFO`, `WARNING`, `ERROR`, [etc](https://github.com/Azure/go-autorest/blob/50e09bb39af124f28f29ba60efde3fa74a4fe93f/logger/logger.go#L65-L73). |
 | `feature.enableGetVolumeStats`                    | allow GET_VOLUME_STATS on agent node                       | `true`                      |
 | `feature.enableVolumeMountGroup`                  | indicates whether enabling VOLUME_MOUNT_GROUP                       | `true`                      |
+| `feature.fsGroupPolicy`                           | CSIDriver FSGroupPolicy value                  | `ReadWriteOnceWithFSType`(available values: `ReadWriteOnceWithFSType`, `File`, `None`) |
 | `image.baseRepo`                                  | base repository of driver images                           | `mcr.microsoft.com`                      |
 | `image.azurefile.repository`                      | azurefile-csi-driver docker image                          | `/oss/kubernetes-csi/azurefile-csi`                            |
 | `image.azurefile.tag`                             | azurefile-csi-driver docker image tag                      | ``                                                            |
diff --git a/charts/latest/azurefile-csi-driver-v0.0.0.tgz b/charts/latest/azurefile-csi-driver-v0.0.0.tgz
index 5b8bab217a..99f20d98a2 100644
Binary files a/charts/latest/azurefile-csi-driver-v0.0.0.tgz and b/charts/latest/azurefile-csi-driver-v0.0.0.tgz differ
diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
index e1facb056a..8b715aee64 100644
--- a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
+++ b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
@@ -14,4 +14,4 @@ spec:
   volumeLifecycleModes:
     - Persistent
     - Ephemeral
-  fsGroupPolicy: ReadWriteOnceWithFSType
+  fsGroupPolicy: {{ .Values.feature.fsGroupPolicy }}
diff --git a/charts/latest/azurefile-csi-driver/values.yaml b/charts/latest/azurefile-csi-driver/values.yaml
index 2c98635344..dd10442b12 100644
--- a/charts/latest/azurefile-csi-driver/values.yaml
+++ b/charts/latest/azurefile-csi-driver/values.yaml
@@ -157,6 +157,7 @@ snapshot:
 feature:
   enableGetVolumeStats: true
   enableVolumeMountGroup: true
+  fsGroupPolicy: ReadWriteOnceWithFSType
 
 driver:
   name: file.csi.azure.com