diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example
index 55049f4d1a..fc44a9bfc7 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.example
@@ -530,6 +530,14 @@
 #           Location in which to mount NFS shares, typically
 #           '$state_path/mnt'.
 #
+#           Option: nfs_mount_options (optional, string)
+#           Mount options used for the NFS mount points.
+#
+#           Option: shares (required)
+#           List of shares to populate the 'nfs_shares_config' file. Each share
+#           uses the following format:
+#           - { ip: "{{ ip_nfs_server }}", share "/vol/cinder" }
+#
 #           The following options apply to the NetApp backend driver:
 #
 #           Option: volume_driver (required, string)
@@ -561,20 +569,6 @@
 #           Option: netapp_password (required, string)
 #           NetApp server password.
 #
-#        Level: cinder_nfs_client (optional)
-#        Automates management of the file that cinder references for a list of
-#        NFS mounts.
-#
-#          Option: nfs_shares_config (required, string)
-#          File containing list of NFS shares available to cinder, typically
-#          typically /etc/cinder/nfs_shares.
-#
-#          Level: shares (required)
-#          List of shares to populate the 'nfs_shares_config' file. Each share
-#          uses the following format:
-#
-#          - { ip: "{{ ip_nfs_server }}", share: "/vol/cinder" }
-#
 # Example:
 #
 # Define an OpenStack storage host:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example
index 6a0500ddcb..1de7199634 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.prod.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.prod.example
@@ -252,7 +252,10 @@ storage_hosts:
     container_vars:
       cinder_backends:
         limit_container_types: cinder_volume
-        cinder_nfs_client:
+        nfs_volume:
+          volume_backend_name: NFS_VOLUME1
+          volume_driver: cinder.volume.drivers.nfs.NfsDriver
+          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
           nfs_shares_config: /etc/cinder/nfs_shares
           shares:
             - ip: "172.29.244.15"
@@ -262,7 +265,10 @@ storage_hosts:
     container_vars:
       cinder_backends:
         limit_container_types: cinder_volume
-        cinder_nfs_client:
+        nfs_volume:
+          volume_backend_name: NFS_VOLUME1
+          volume_driver: cinder.volume.drivers.nfs.NfsDriver
+          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
           nfs_shares_config: /etc/cinder/nfs_shares
           shares:
             - ip: "172.29.244.15"
@@ -272,7 +278,10 @@ storage_hosts:
     container_vars:
       cinder_backends:
         limit_container_types: cinder_volume
-        cinder_nfs_client:
+        nfs_volume:
+          volume_backend_name: NFS_VOLUME1
+          volume_driver: cinder.volume.drivers.nfs.NfsDriver
+          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
           nfs_shares_config: /etc/cinder/nfs_shares
           shares:
             - ip: "172.29.244.15"