diff --git a/values-override.yaml b/values-override.yaml
index 297579a..22610a3 100644
--- a/values-override.yaml
+++ b/values-override.yaml
@@ -7,7 +7,7 @@ global:
     - name: regcred
   storage:
     provisioningType: "dynamic"
-    storageClassName: "nfs"
+    storageClassName: "nfs-csi"
     volumes:
       - name: events
         enabled: true
@@ -18,7 +18,6 @@ global:
         accessModes:
           - ReadWriteMany
         capacity: 1Gi
-        volumeName: apim-events
         storageClassName: nfs-csi
       - name: payloads
         enabled: true
@@ -28,7 +27,6 @@ global:
         accessModes:
           - ReadWriteOnce
         capacity: 16Gi
-        volumeName: apim-payloads
       - name: audit
         enabled: true
         usedBy:
@@ -39,7 +37,6 @@ global:
         accessModes:
           - ReadWriteMany
         capacity: 1Gi
-        volumeName: apim-audit
       - name: anm-external-config
         enabled: true
         usedBy:
@@ -78,7 +75,6 @@ global:
         accessModes:
           - ReadWriteOnce
         capacity: 8Gi
-        volumeName: apim-opentraffic
   initContainers:
     securityContext:
       # runAsNonRoot: true
@@ -114,7 +110,8 @@ anm:
     requests:
       memory: "1Gi"
       cpu: "250m"
-  securityContext: {}
+  securityContext:
+    {}
     #runAsNonRoot: true
   route:
     enabled: true
@@ -315,7 +312,8 @@ apitraffic:
     maxReplicas: 6
     targetCPUUtilizationPercentage: 80
   replicaCount: 1
-  securityContext: {}
+  securityContext:
+    {}
     #runAsNonRoot: true
   oauth:
     enabled: true
@@ -546,7 +544,8 @@ apiportal:
   mysql:
     enabled: false
     # if the credentials are already available in a secret, set existingSecret
-    existingSecret: {}
+    existingSecret:
+      {}
       # name: "mysql-credentials"
       # keyMapping:
       #  password: password