diff --git a/helm-charts/hypha-server/templates/deployment.yaml b/helm-charts/hypha-server/templates/deployment.yaml
index 3b3fc001..d2972664 100644
--- a/helm-charts/hypha-server/templates/deployment.yaml
+++ b/helm-charts/hypha-server/templates/deployment.yaml
@@ -56,14 +56,7 @@ spec:
       volumes:
         - name: {{ .Values.persistence.volumeName }}
           persistentVolumeClaim:
-            claimName: {{ .Values.persistence.existingClaim | default (include "hypha-server.fullname" .) }}
-            {{- if not .Values.persistence.existingClaim }}
-            accessModes:
-              {{- toYaml .Values.persistence.accessModes | nindent 14 }}
-            resources:
-              requests:
-                storage: {{ .Values.persistence.size }}
-            {{- end }}
+            claimName: {{ .Values.persistence.claimName }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm-charts/hypha-server/templates/pvc.yaml b/helm-charts/hypha-server/templates/pvc.yaml
new file mode 100644
index 00000000..b5d2907a
--- /dev/null
+++ b/helm-charts/hypha-server/templates/pvc.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: hypha-data-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
diff --git a/helm-charts/hypha-server/values.yaml b/helm-charts/hypha-server/values.yaml
index 00707e36..32e01d35 100644
--- a/helm-charts/hypha-server/values.yaml
+++ b/helm-charts/hypha-server/values.yaml
@@ -116,9 +116,5 @@ startupCommand:
 # Persistence Configuration
 persistence:
   volumeName: hypha-app-storage
+  claimName: hypha-data-pvc
   mountPath: /app/data
-  storageClass: ""
-  accessModes:
-    - ReadWriteOnce
-  size: 5Gi
-  existingClaim: ""  # If you have an existing claim, specify it here. Otherwise, a new PVC will be created.