diff --git a/charts/url-shortener/templates/install.yaml b/charts/url-shortener/templates/install.yaml
index a0fc858..d06ccdd 100644
--- a/charts/url-shortener/templates/install.yaml
+++ b/charts/url-shortener/templates/install.yaml
@@ -46,4 +46,4 @@
       volumes:
       - name: url-shortener
         persistentVolumeClaim:
-          claimName: url-shortener
+          claimName: {{ .Values.persistentVolumeClaimName }}
diff --git a/charts/url-shortener/templates/volume.yaml b/charts/url-shortener/templates/volume.yaml
deleted file mode 100644
index 992e601..0000000
--- a/charts/url-shortener/templates/volume.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: url-shortener
-  namespace: {{ .Release.Namespace }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.storage.size }}
diff --git a/charts/url-shortener/values.yaml b/charts/url-shortener/values.yaml
index dd3da7d..c9dd02e 100644
--- a/charts/url-shortener/values.yaml
+++ b/charts/url-shortener/values.yaml
@@ -2,7 +2,6 @@
   repository: giolekva/url-shortener
   tag: latest
   pullPolicy: Always
-storage:
-  size: 1Gi
+persistentVolumeClaimName: "data"
 portName: http
 requireAuth: false