diff --git a/stable/nfs-client-provisioner/Chart.yaml b/stable/nfs-client-provisioner/Chart.yaml
index 58ac90c3a8..c202ba0282 100644
--- a/stable/nfs-client-provisioner/Chart.yaml
+++ b/stable/nfs-client-provisioner/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 3.0.2
 description: nfs-client is an automatic provisioner that used your *already configured* NFS server, automatically creating Persistent Volumes.
 name: nfs-client-provisioner
 home: https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client
-version: 0.1.3
+version: 1.0.0
 sources:
 - https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client
 maintainers:
diff --git a/stable/nfs-client-provisioner/README.md b/stable/nfs-client-provisioner/README.md
index 63a319b821..769a1f9029 100644
--- a/stable/nfs-client-provisioner/README.md
+++ b/stable/nfs-client-provisioner/README.md
@@ -60,6 +60,6 @@ The following tables lists the configurable parameters of this chart and their d
 | `nfs.path`                        | Basepath of the mount point to be used      | `/ifs/kubernetes`                                         |
 | `resources`                       | Resources required (e.g. CPU, memory)       | `{}`                                                      |
 | `rbac.create` 		    | Use Role-based Access Control		  | `true`						      |
-| `rbac.pspEnabled` 		    | Create & use Pod Security Policy resources  | `false`						      |
+| `podSecurityPolicy.enabled`	    | Create & use Pod Security Policy resources  | `false`						      |
 | `serviceAccount.create`	    | Should we create a ServiceAccount	          | `true`						      |
 | `serviceAccount.name`		    | Name of the ServiceAccount to use           | null						      |
diff --git a/stable/nfs-client-provisioner/ci/test-values.yaml b/stable/nfs-client-provisioner/ci/test-values.yaml
index 2ef0a71579..4903829f28 100644
--- a/stable/nfs-client-provisioner/ci/test-values.yaml
+++ b/stable/nfs-client-provisioner/ci/test-values.yaml
@@ -1,2 +1,4 @@
 nfs:
   server: 127.0.0.1
+podSecurityPolicy:
+  enabled: true
diff --git a/stable/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml
index a5b83795a5..03bc93ec40 100644
--- a/stable/nfs-client-provisioner/templates/clusterrole.yaml
+++ b/stable/nfs-client-provisioner/templates/clusterrole.yaml
@@ -23,7 +23,7 @@ rules:
   - apiGroups: [""]
     resources: ["endpoints"]
     verbs: ["get", "list", "watch", "create", "update", "patch"]
-{{- if .Values.rbac.pspEnabled }}
+{{- if .Values.podSecurityPolicy.enabled }}
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
diff --git a/stable/nfs-client-provisioner/templates/podsecuritypolicy.yaml b/stable/nfs-client-provisioner/templates/podsecuritypolicy.yaml
index fb6d6ca821..290fbcd72c 100644
--- a/stable/nfs-client-provisioner/templates/podsecuritypolicy.yaml
+++ b/stable/nfs-client-provisioner/templates/podsecuritypolicy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.pspEnabled }}
+{{- if .Values.podSecurityPolicy.enabled }}
 apiVersion: extensions/v1beta1
 kind: PodSecurityPolicy
 metadata:
diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml
index 95dfad414a..d4d8593355 100644
--- a/stable/nfs-client-provisioner/values.yaml
+++ b/stable/nfs-client-provisioner/values.yaml
@@ -43,9 +43,10 @@ rbac:
   # Specifies whether RBAC resources should be created
   create: true
 
-  # If true, create & use Pod Security Policy resources
-  # https://kubernetes.io/docs/concepts/policy/pod-security-policy/
-  pspEnabled: false
+# If true, create & use Pod Security Policy resources
+# https://kubernetes.io/docs/concepts/policy/pod-security-policy/
+podSecurityPolicy:
+  enabled: false
 
 serviceAccount:
   # Specifies whether a ServiceAccount should be created