diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index 09ad457797..cd9e008459 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -160,4 +160,7 @@ spec:
         resources:
           requests:
             storage: {{ .Values.server.storage }}
+        {{- if .Values.server.storageClass }}
+        storageClassName: {{ .Values.server.storageClass }}
+        {{- end }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
index 03f38a1cfc..1404bdc229 100644
--- a/values.yaml
+++ b/values.yaml
@@ -30,6 +30,7 @@ server:
   replicas: 3
   bootstrapExpect: 3 # Should <= replicas count
   storage: 10Gi
+  #storageClass: default # <= name of the storage class to use
 
   # connect will enable Connect on all the servers, initializing a CA
   # for Connect-related connections. Other customizations can be done