diff --git a/glance/templates/pvc-images.yaml b/glance/templates/pvc-images.yaml
index 0d1d8663fc..469ee42940 100644
--- a/glance/templates/pvc-images.yaml
+++ b/glance/templates/pvc-images.yaml
@@ -18,10 +18,10 @@ apiVersion: v1
 metadata:
   name: glance-images
   annotations:
-    volume.beta.kubernetes.io/storage-class: general
+    {{ .Values.volume.class_path }}: {{ .Values.volume.class_name }}
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources:
     requests:
-      storage: 20Gi
+      storage: {{ .Values.volume.size }}
 {{- end }}
diff --git a/glance/values.yaml b/glance/values.yaml
index a47c7c636d..f99c557c6e 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -152,6 +152,11 @@ ceph:
   # common/secrets/ceph-client-key
   glance_keyring: null
 
+volume:
+  class_path: volume.beta.kubernetes.io/storage-class
+  class_name: general
+  size: 2Gi
+
 misc:
   workers: 8
   debug: false