diff --git a/helm/template/lab/configmap/configmap.yaml b/helm/template/lab/configmap/configmap.yaml
deleted file mode 100644
index c551f4fd..00000000
--- a/helm/template/lab/configmap/configmap.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-configMap:
-  enabled: true
-  name: configmap
-  mountPath: {}
-  readOnly: true
-  data: {}
-
-serviceAccount:
-  create: false
-  annotations: {}
-  name: "devopscorner"
-  namespace: "devopscorner-dev"
\ No newline at end of file
diff --git a/helm/template/lab/stateful/stateful.yaml b/helm/template/lab/stateful/stateful.yaml
index f102581f..6eb4461e 100644
--- a/helm/template/lab/stateful/stateful.yaml
+++ b/helm/template/lab/stateful/stateful.yaml
@@ -73,10 +73,10 @@ persistence:
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   set, choosing the default provisioner.  (gp3 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  # storageClass: "gp2"
+  # storageClass: "gp3"
   # persistentVolumeReclaimPolicy: Recycle
   # volumeMode: Filesystem
   accessMode: ReadWriteOnce
diff --git a/helm/template/lab/stateful/values.yaml b/helm/template/lab/stateful/values.yaml
index f801efd8..5ad58873 100644
--- a/helm/template/lab/stateful/values.yaml
+++ b/helm/template/lab/stateful/values.yaml
@@ -67,10 +67,10 @@ persistence:
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   set, choosing the default provisioner.  (gp3 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  # storageClass: "gp2"
+  # storageClass: "gp3"
   # persistentVolumeReclaimPolicy: Recycle
   # volumeMode: Filesystem
   accessMode: ReadWriteOnce
diff --git a/helm/template/prod/stateful/stateful.yaml b/helm/template/prod/stateful/stateful.yaml
index f102581f..6eb4461e 100644
--- a/helm/template/prod/stateful/stateful.yaml
+++ b/helm/template/prod/stateful/stateful.yaml
@@ -73,10 +73,10 @@ persistence:
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   set, choosing the default provisioner.  (gp3 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  # storageClass: "gp2"
+  # storageClass: "gp3"
   # persistentVolumeReclaimPolicy: Recycle
   # volumeMode: Filesystem
   accessMode: ReadWriteOnce
diff --git a/helm/template/prod/stateful/values.yaml b/helm/template/prod/stateful/values.yaml
index f801efd8..5ad58873 100644
--- a/helm/template/prod/stateful/values.yaml
+++ b/helm/template/prod/stateful/values.yaml
@@ -67,10 +67,10 @@ persistence:
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   set, choosing the default provisioner.  (gp3 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  # storageClass: "gp2"
+  # storageClass: "gp3"
   # persistentVolumeReclaimPolicy: Recycle
   # volumeMode: Filesystem
   accessMode: ReadWriteOnce
diff --git a/helm/template/staging/stateful/stateful.yaml b/helm/template/staging/stateful/stateful.yaml
index f102581f..6eb4461e 100644
--- a/helm/template/staging/stateful/stateful.yaml
+++ b/helm/template/staging/stateful/stateful.yaml
@@ -73,10 +73,10 @@ persistence:
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   set, choosing the default provisioner.  (gp3 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  # storageClass: "gp2"
+  # storageClass: "gp3"
   # persistentVolumeReclaimPolicy: Recycle
   # volumeMode: Filesystem
   accessMode: ReadWriteOnce
diff --git a/helm/template/staging/stateful/values.yaml b/helm/template/staging/stateful/values.yaml
index f801efd8..5ad58873 100644
--- a/helm/template/staging/stateful/values.yaml
+++ b/helm/template/staging/stateful/values.yaml
@@ -67,10 +67,10 @@ persistence:
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   set, choosing the default provisioner.  (gp3 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  # storageClass: "gp2"
+  # storageClass: "gp3"
   # persistentVolumeReclaimPolicy: Recycle
   # volumeMode: Filesystem
   accessMode: ReadWriteOnce