diff --git a/templates/_deployment.tpl b/templates/_deployment.tpl
index ff83267..4b011a9 100644
--- a/templates/_deployment.tpl
+++ b/templates/_deployment.tpl
@@ -66,6 +66,9 @@
 {{- if and .Values.persistentVolumeClaim.enabled (not .Values.persistentVolumeClaim.existing.enabled) }}
 {{- $persistentVolumeClaimName := include "reposilite.persistentVolumeClaim.name" $ -}}
 {{- $volumes = concat $volumes (list (dict "name" "data" "persistentVolumeClaim" (dict "claimName" $persistentVolumeClaimName))) }}
+{{- else if and .Values.persistentVolumeClaim.enabled .Values.persistentVolumeClaim.existing.enabled .Values.persistentVolumeClaim.existing.persistentVolumeClaimName -}}
+{{- $persistentVolumeClaimName := .Values.persistentVolumeClaim.existing.persistentVolumeClaimName -}}
+{{- $volumes = concat $volumes (list (dict "name" "data" "persistentVolumeClaim" (dict "claimName" $persistentVolumeClaimName))) }}
 {{- end }}
 
 {{ toYaml (dict "volumes" $volumes) }}
diff --git a/unittests/deployment/mountPersistentVolumeClaim.yaml b/unittests/deployment/mountPersistentVolumeClaim.yaml
index 7b58b1b..bf1bbc2 100644
--- a/unittests/deployment/mountPersistentVolumeClaim.yaml
+++ b/unittests/deployment/mountPersistentVolumeClaim.yaml
@@ -50,3 +50,26 @@ tests:
         name: data
         persistentVolumeClaim:
           claimName: reposilite-unittest
+
+- it: Rendering custom volumes and volumeMounts with persistent volume claim
+  set:
+    persistentVolumeClaim.enabled: true
+    persistentVolumeClaim.existing.enabled: true
+    persistentVolumeClaim.existing.persistentVolumeClaimName: my-custom-pvc
+  asserts:
+  - contains:
+      path: spec.template.spec.containers[0].env
+      content:
+        name: REPOSILITE_DATA
+        value: /app/data
+  - contains:
+      path: spec.template.spec.containers[0].volumeMounts
+      content:
+        name: data
+        mountPath: /app/data
+  - contains:
+      path: spec.template.spec.volumes
+      content:
+        name: data
+        persistentVolumeClaim:
+          claimName: my-custom-pvc
\ No newline at end of file