diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml
index d2d60f0..988cc83 100644
--- a/charts/jumpserver/templates/celery/deployment-celery.yaml
+++ b/charts/jumpserver/templates/celery/deployment-celery.yaml
@@ -89,8 +89,14 @@ spec:
               subPath: "config.yml"
             - mountPath: "/opt/jumpserver/data"
               name: "jms-core-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
             - mountPath: "/opt/jumpserver/logs"
               name: "jms-core-logs"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
@@ -100,7 +106,11 @@ spec:
             name: '{{ include "jumpserver.fullname" $ }}-jms-core'
           name: "jms-core-config"
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            {{- end }}
           name: "jms-core-data"
         - persistentVolumeClaim:
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-logs'
diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml
index e0dc9e4..544b512 100644
--- a/charts/jumpserver/templates/core/deployment-core.yaml
+++ b/charts/jumpserver/templates/core/deployment-core.yaml
@@ -96,8 +96,14 @@ spec:
               subPath: "config.yml"
             - mountPath: "/opt/jumpserver/data"
               name: "jms-core-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
             - mountPath: "/opt/jumpserver/logs"
               name: "jms-core-logs"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
@@ -107,7 +113,11 @@ spec:
             name: '{{ include "jumpserver.fullname" $ }}-jms-core'
           name: "jms-core-config"
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            {{- end }}
           name: "jms-core-data"
         - persistentVolumeClaim:
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-logs'
diff --git a/charts/jumpserver/templates/koko/deployment-koko.yaml b/charts/jumpserver/templates/koko/deployment-koko.yaml
index e1f73b4..fd9ea6f 100644
--- a/charts/jumpserver/templates/koko/deployment-koko.yaml
+++ b/charts/jumpserver/templates/koko/deployment-koko.yaml
@@ -82,13 +82,20 @@ spec:
           volumeMounts:
             - mountPath: "/opt/koko/data"
               name: "jms-koko-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
       restartPolicy: Always
       volumes:
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-koko-data'
+            {{- end }}
           name: "jms-koko-data"
       {{- with .volumes }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/jumpserver/templates/lion/deployment-lion.yaml b/charts/jumpserver/templates/lion/deployment-lion.yaml
index 80f15b4..4f8c7b7 100644
--- a/charts/jumpserver/templates/lion/deployment-lion.yaml
+++ b/charts/jumpserver/templates/lion/deployment-lion.yaml
@@ -75,13 +75,20 @@ spec:
           volumeMounts:
             - mountPath: "/opt/lion/data"
               name: "jms-lion-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
       restartPolicy: Always
       volumes:
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-lion-data'
+            {{- end }}
           name: "jms-lion-data"
       {{- with .volumes }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
index c75cd8e..3468f66 100644
--- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@@ -73,13 +73,20 @@ spec:
           volumeMounts:
             - mountPath: "/opt/magnus/data"
               name: "jms-magnus-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
       restartPolicy: Always
       volumes:
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-magnus-data'
+            {{- end }}
           name: "jms-magnus-data"
       {{- with .volumes }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml b/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
index f0d232c..9db8c3d 100644
--- a/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
+++ b/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
@@ -67,13 +67,20 @@ spec:
           volumeMounts:
             - mountPath: "/opt/omnidb/data"
               name: "jms-omnidb-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
       restartPolicy: Always
       volumes:
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-omnidb-data'
+            {{- end }}
           name: "jms-omnidb-data"
       {{- with .volumes }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/jumpserver/templates/web/deployment-nginx.yaml b/charts/jumpserver/templates/web/deployment-nginx.yaml
index b82ad65..740fab4 100644
--- a/charts/jumpserver/templates/web/deployment-nginx.yaml
+++ b/charts/jumpserver/templates/web/deployment-nginx.yaml
@@ -62,8 +62,14 @@ spec:
               subPath: "default.conf"
             - mountPath: "/opt/jumpserver/data"
               name: "jms-core-data"
+              {{- if $.Values.core.persistence.subPath }}
+              subPath: {{ $.Values.core.persistence.subPath | quote }}
+              {{- end }}
             - mountPath: "/var/log/nginx"
               name: "jms-web-logs"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
@@ -73,10 +79,18 @@ spec:
             name: '{{ include "jumpserver.fullname" $ }}-jms-web'
           name: "jms-web-config"
         - persistentVolumeClaim:
+            {{- if $.Values.core.persistence.existingClaim }}
+            claimName: {{ $.Values.core.persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            {{- end }}
           name: "jms-core-data"
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-web-logs'
+            {{- end }}
           name: "jms-web-logs"
       {{- with .volumes }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
index d428217..1b5c967 100644
--- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
+++ b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
@@ -67,13 +67,20 @@ spec:
           volumeMounts:
             - mountPath: "/opt/xrdp/data"
               name: "jms-xrdp-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
           {{- with .volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
       restartPolicy: Always
       volumes:
         - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
             claimName: '{{ include "jumpserver.fullname" $ }}-jms-xrdp-data'
+            {{- end }}
           name: "jms-xrdp-data"
       {{- with .volumes }}
         {{- tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index 5531b49..5f0b07c 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -147,7 +147,7 @@ core:
     finalizers:
       - kubernetes.io/pvc-protection
     # subPath: ""
-    # existingClaim:
+    # existingClaim: ""
 
   volumeMounts: []
 
@@ -237,6 +237,8 @@ koko:
     # annotations: {}
     finalizers:
       - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""
 
   volumeMounts: []
 
@@ -326,6 +328,8 @@ lion:
     # annotations: {}
     finalizers:
       - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""
 
   volumeMounts: []
 
@@ -409,6 +413,8 @@ magnus:
     # annotations: {}
     finalizers:
       - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""
 
   volumeMounts: []
 
@@ -489,6 +495,8 @@ omnidb:
     # annotations: {}
     finalizers:
       - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""
 
   volumeMounts: []
 
@@ -575,6 +583,8 @@ xrdp:
     # annotations: {}
     finalizers:
       - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""
 
   volumeMounts: []
 
@@ -654,6 +664,8 @@ web:
     # annotations: {}
     finalizers:
       - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""
 
   volumeMounts: []