diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml
index 5749a61515..c61a6abbf7 100644
--- a/environments/manila-netapp-config.yaml
+++ b/environments/manila-netapp-config.yaml
@@ -10,21 +10,21 @@ parameter_defaults:
   ManilaNetappEnableBackend: true
   ManilaNetappBackendName: tripleo_netapp
   ManilaNetappDriverHandlesShareServers: true
-  ManilaNetappLogin: ''
-  ManilaNetappPassword: ''
-  ManilaNetappServerHostname: ''
+  ManilaNetappLogin: "''"
+  ManilaNetappPassword: "''"
+  ManilaNetappServerHostname: "''"
   ManilaNetappTransportType: 'http'
   ManilaNetappStorageFamily: 'ontap_cluster'
   ManilaNetappServerPort: 80
   ManilaNetappVolumeNameTemplate: 'share_%(share_id)s'
-  ManilaNetappVserver: ''
+  ManilaNetappVserver: "''"
   ManilaNetappVserverNameTemplate: 'os_%s'
   ManilaNetappLifNameTemplate: 'os_%(net_allocation_id)s'
   ManilaNetappAggrNameSearchPattern: '(.*)'
-  ManilaNetappRootVolumeAggr: ''
+  ManilaNetappRootVolumeAggr: "''"
   ManilaNetappRootVolume: 'root'
   ManilaNetappPortNameSearchPattern: '(.*)'
-  ManilaNetappTraceFlags: ''
+  ManilaNetappTraceFlags: "''"
   ManilaNetappEnabledShareProtocols: 'nfs3, nfs4.0'
   ManilaNetappVolumeSnapshotReservePercent: 5
   ManilaNetappSnapmirrorQuiesceTimeout: 3600
diff --git a/puppet/services/manila-backend-netapp.yaml b/puppet/services/manila-backend-netapp.yaml
index c95a8da756..2d824c1eb6 100644
--- a/puppet/services/manila-backend-netapp.yaml
+++ b/puppet/services/manila-backend-netapp.yaml
@@ -15,13 +15,13 @@ parameters:
     default: tripleo_netapp
   ManilaNetappLogin:
     type: string
-    default: ''
+    default: "''"
   ManilaNetappPassword:
     type: string
-    default: ''
+    default: "''"
   ManilaNetappServerHostname:
     type: string
-    default: ''
+    default: "''"
   ManilaNetappTransportType:
     type: string
     default: 'http'
@@ -36,7 +36,7 @@ parameters:
     default: 'share_%(share_id)s'
   ManilaNetappVserver:
     type: string
-    default: ''
+    default: "''"
   ManilaNetappVserverNameTemplate:
     type: string
     default: 'os_%s'
@@ -48,7 +48,7 @@ parameters:
     default: '(.*)'
   ManilaNetappRootVolumeAggr:
     type: string
-    default: ''
+    default: "''"
   ManilaNetappRootVolume:
     type: string
     default: 'root'
@@ -57,7 +57,7 @@ parameters:
     default: '(.*)'
   ManilaNetappTraceFlags:
     type: string
-    default: ''
+    default: "''"
   ManilaNetappEnabledShareProtocols:
     type: string
     default: 'nfs3, nfs4.0'