diff --git a/charts/spire/README.md b/charts/spire/README.md
index 911a34e..7154330 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -40,10 +40,10 @@ global:
       commonName: example.org
 ```
 
-2. If you need a non default storageClass, append the following to the spire-server section and update:
+2. If you need a non default storageClass, append the following to the global.spire section and update:
 ```
-  persistence:
-    storageClass: your-storage-class
+    persistence:
+      storageClass: your-storage-class
 ```
 
 3. If your Kubernetes cluster is OpenShift based, use the output of the following command to update the trustDomain setting:
@@ -219,6 +219,7 @@ Now you can interact with the Spire agent socket from your own application. The
 | `global.spire.caSubject.country`                 | Country for Spire server CA                                                                                                                                                                                                            | `""`              |
 | `global.spire.caSubject.organization`            | Organization for Spire server CA                                                                                                                                                                                                       | `""`              |
 | `global.spire.caSubject.commonName`              | Common Name for Spire server CA                                                                                                                                                                                                        | `""`              |
+| `global.spire.persistence.storageClass`          | What storage class to use for persistence                                                                                                                                                                                              | `nil`             |
 | `global.spire.recommendations.enabled`           | Use recommended settings for production deployments. Default is off.                                                                                                                                                                   | `false`           |
 | `global.spire.recommendations.namespaceLayout`   | Set to true to use recommended values for installing across namespaces                                                                                                                                                                 | `true`            |
 | `global.spire.recommendations.namespacePSS`      | When chart namespace creation is enabled, label them with preffered Pod Security Standard labels                                                                                                                                       | `true`            |
diff --git a/charts/spire/charts/spire-server/templates/server-resource.yaml b/charts/spire/charts/spire-server/templates/server-resource.yaml
index 8a0634b..4793db9 100644
--- a/charts/spire/charts/spire-server/templates/server-resource.yaml
+++ b/charts/spire/charts/spire-server/templates/server-resource.yaml
@@ -509,7 +509,8 @@ spec:
         resources:
           requests:
             storage: {{ .Values.persistence.size }}
-        {{- if .Values.persistence.storageClass }}
-        storageClassName: {{ .Values.persistence.storageClass }}
+        {{- $storageClass := (dig "spire" "persistence" "storageClass" nil .Values.global) | default .Values.persistence.storageClass }}
+        {{- if $storageClass }}
+        storageClassName: {{ $storageClass }}
         {{- end }}
-  {{- end }}
\ No newline at end of file
+  {{- end }}
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 81558a3..c77eb69 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -29,6 +29,10 @@ global:
       organization: ""
       commonName: ""
 
+    persistence:
+      ## @param global.spire.persistence.storageClass What storage class to use for persistence
+      storageClass: null
+
     ## @param global.spire.recommendations.enabled Use recommended settings for production deployments. Default is off.
     ## @param global.spire.recommendations.namespaceLayout Set to true to use recommended values for installing across namespaces
     ## @param global.spire.recommendations.namespacePSS When chart namespace creation is enabled, label them with preffered Pod Security Standard labels