diff --git a/mariadb/templates/mariadb-deployment.yaml b/mariadb/templates/mariadb-deployment.yaml
index 43722189ff..09ed86db91 100644
--- a/mariadb/templates/mariadb-deployment.yaml
+++ b/mariadb/templates/mariadb-deployment.yaml
@@ -34,7 +34,7 @@ apiVersion: v1
 metadata:
   name: mariadb-{{$v}}
   annotations:
-    volume.beta.kubernetes.io/storage-class: "general"  
+    {{ $root.Values.storage.class_path }}: {{ $root.Values.storage.class_name }}  
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources:
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 8d87d7ee68..5f7ee60091 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -9,6 +9,8 @@ images:
   mariadb: quay.io/stackanetes/stackanetes-mariadb:newton
 
 volume:
+  class_path: volume.alpha.kubernetes.io/storage-class
+  class_name: general
   size: 20Gi
 
 labels: