diff --git a/environments/storage/nova-nfs.yaml b/environments/storage/nova-nfs.yaml
index b3a354c60e..f2e8bc8a5f 100644
--- a/environments/storage/nova-nfs.yaml
+++ b/environments/storage/nova-nfs.yaml
@@ -17,6 +17,10 @@ parameter_defaults:
   # Type: string
   NovaNfsShare: ''
 
+  # NFS version used for nova storage (when NovaNfsEnabled is true). Since NFSv3 does not support full locking a NFSv4 version need to be used. To not break current installations the default is the previous hard coded version 4.
+  # Type: string
+  NovaNfsVersion: "4.2"
+
   # ******************************************************
   # Static parameters - these are values that must be
   # included in the environment but should not be changed.
diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml
index e7c132a063..e04eaf456a 100644
--- a/sample-env-generator/storage.yaml
+++ b/sample-env-generator/storage.yaml
@@ -53,12 +53,13 @@ environments:
           - NovaNfsVersion
     sample_values:
       NovaNfsEnabled: True
-      NovaNfsVersion: '4.2'
+      NovaNfsVersion: '"4.2"'
     static:
       - NovaNfsEnabled
     description: |
       Configure and include this environment to enable the use of an NFS
       share as the backend for Nova.
+  -
     name: storage/cinder-netapp-config
     title: Enable the Cinder NetApp Backend
     description: |