diff --git a/charts/common/templates/_pvc.yaml b/charts/common/templates/_pvc.yaml
index 7ccd083..5698998 100644
--- a/charts/common/templates/_pvc.yaml
+++ b/charts/common/templates/_pvc.yaml
@@ -1,5 +1,6 @@
 {{- define "common.pvc.tpl" -}}
 {{- range .Values.volumes }}
+{{- if not .existingClaim }}
 {{- $robustName := include "common.robustName" $.Release.Name }}
 ---
 apiVersion: v1
@@ -15,4 +16,5 @@ spec:
     requests:
       storage: {{ .size | default "1Gi" }}
 {{- end }}
+{{- end }}
 {{- end -}}
diff --git a/charts/common/templates/_volumesRef.yaml b/charts/common/templates/_volumesRef.yaml
index cd027b4..9f44c83 100644
--- a/charts/common/templates/_volumesRef.yaml
+++ b/charts/common/templates/_volumesRef.yaml
@@ -4,7 +4,11 @@ volumes:
   {{- range .Values.volumes }}
   - name: {{ .name }}
     persistentVolumeClaim:
+      {{- if .existingClaim }}
+      claimName: {{ .existingClaim }}
+      {{ else }}
       claimName: {{ printf "%s-%s" $.Release.Name .name }}
+      {{- end }}
   {{- end }}
   {{- range .Values.sealedFileSecrets }}
   - name: {{ .name }}
diff --git a/charts/cron-job/charts/common-0.1.0.tgz b/charts/cron-job/charts/common-0.1.0.tgz
index 47fc1a7..52b645b 100644
Binary files a/charts/cron-job/charts/common-0.1.0.tgz and b/charts/cron-job/charts/common-0.1.0.tgz differ
diff --git a/charts/onechart/charts/common-0.1.0.tgz b/charts/onechart/charts/common-0.1.0.tgz
index 7a08785..f99311b 100644
Binary files a/charts/onechart/charts/common-0.1.0.tgz and b/charts/onechart/charts/common-0.1.0.tgz differ
diff --git a/charts/onechart/tests/deployment_volumes_test.yaml b/charts/onechart/tests/deployment_volumes_test.yaml
index 766499f..8830c6e 100644
--- a/charts/onechart/tests/deployment_volumes_test.yaml
+++ b/charts/onechart/tests/deployment_volumes_test.yaml
@@ -60,4 +60,17 @@ tests:
     asserts:
       - equal:
           path: spec.strategy.type
-          value: Dummy
\ No newline at end of file
+          value: Dummy
+  - it: Should use the existing claim
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          existingClaim: my-static-claim
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: data
+              persistentVolumeClaim:
+                claimName: my-static-claim
diff --git a/charts/onechart/tests/pvc_test.yaml b/charts/onechart/tests/pvc_test.yaml
index a85e381..fbb4d8d 100644
--- a/charts/onechart/tests/pvc_test.yaml
+++ b/charts/onechart/tests/pvc_test.yaml
@@ -13,3 +13,12 @@ tests:
       - equal:
           path: spec.storageClassName
           value: default
+  - it: Should not generate a claim when using existing claim
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          existingClaim: my-static-claim
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/values.yaml b/values.yaml
index 29924db..7457449 100644
--- a/values.yaml
+++ b/values.yaml
@@ -21,5 +21,4 @@ vars:
 volumes:
   - name: data
     path: /data
-    size: 10Gi
-    storageClass: default
+    existingClaim: myclaim