diff --git a/charts/postgres/templates/postgres-claim0-persistentvolumeclaim.yaml b/charts/postgres/templates/postgres-claim0-persistentvolumeclaim.yaml
index d59e8f0..d19eb09 100644
--- a/charts/postgres/templates/postgres-claim0-persistentvolumeclaim.yaml
+++ b/charts/postgres/templates/postgres-claim0-persistentvolumeclaim.yaml
@@ -6,9 +6,10 @@ metadata:
     {{- include "postgres.labels" . | nindent 6 }}
   name: postgres-claim0
 spec:
+  storageClassName: postgres-retain
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Mi
+      storage: {{ .Values.postgres.storage.size }}
 status: {}
diff --git a/charts/postgres/templates/postgres-deployment.yaml b/charts/postgres/templates/postgres-deployment.yaml
index 17c9655..c1194f6 100644
--- a/charts/postgres/templates/postgres-deployment.yaml
+++ b/charts/postgres/templates/postgres-deployment.yaml
@@ -20,8 +20,6 @@ spec:
     spec:
       containers:
         - env:
-            - name: POSTGRES_DB
-              value: {{ .Values.postgres.service.dbName }}
             - name: POSTGRES_HOST_AUTH_METHOD
               value: {{ .Values.postgres.service.authMethod }}
             - name: POSTGRES_PASSWORD
diff --git a/charts/postgres/templates/postgres-storage-class.yaml b/charts/postgres/templates/postgres-storage-class.yaml
new file mode 100644
index 0000000..e4d460b
--- /dev/null
+++ b/charts/postgres/templates/postgres-storage-class.yaml
@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  creationTimestamp: null
+  labels:
+    {{- include "postgres.labels" . | nindent 6 }}
+  name: postgres-retain
+provisioner: {{ .Values.postgres.storage.provisioner }}
+reclaimPolicy: Retain
+volumeBindingMode: {{ .Values.postgres.storage.volumeBindingMode }}
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
index 86077ab..e094401 100644
--- a/charts/postgres/values.yaml
+++ b/charts/postgres/values.yaml
@@ -22,6 +22,10 @@ postgres:
     dbPassword: cGFzc3dvcmQ=
     sslMode: disable
     schemaVersionTable: swoop.schema_version
+  storage:
+    size: 1Gi
+    volumeBindingMode: WaitForFirstConsumer
+    provisioner: kubernetes.io/no-provisioner
   deployment:
     name: postgres
   replicaCount: 1