diff --git a/deploy/templates/postgres-operator.yaml b/deploy/templates/postgres-operator.yaml
index a888efb38d61de5209890a0a2187c609f49b67e7..7ea69dde834430ca2d3dc9440fe95624bc85aaaf 100644
--- a/deploy/templates/postgres-operator.yaml
+++ b/deploy/templates/postgres-operator.yaml
@@ -22,7 +22,7 @@ spec:
       log_statement: "{{ .Values.postgresql.log_statements | default "none" }}"
   volume:
     size: {{ .Values.postgresql.volume.size }}
-    storageClass: ceph-block
+    storageClass: {{ .Values.postgresql.volume.storageClass }}
   additionalVolumes:
     - name: empty
       mountPath: /opt/empty
diff --git a/deploy/values.production.yaml b/deploy/values.production.yaml
index 98fd1e8be09e8ec27266a4c98297a6f63fb2ec24..72a0729e3b745594b743dc8408f4547c5e670c80 100644
--- a/deploy/values.production.yaml
+++ b/deploy/values.production.yaml
@@ -64,6 +64,8 @@ postgresql:
   teamId: "acid"
   volumne: 
     size: 4Gi
+    storageClass: ceph-block
+
   resources:
     requests:
       cpu: 1500m
diff --git a/deploy/values.yaml b/deploy/values.yaml
index 14ca758e9c8179493da6ab3244cd4491392b1a05..d4194967f30d25a1d1317f112e024879e66bd465 100644
--- a/deploy/values.yaml
+++ b/deploy/values.yaml
@@ -96,6 +96,7 @@ postgresql:
   teamId: "acid"
   volume: 
     size: 1Gi
+    storageClass: isilon