diff --git a/charts/kubernetes-agent/templates/tentacle-pvc.yaml b/charts/kubernetes-agent/templates/tentacle-pvc.yaml
index a538cd4d..9d9595ff 100644
--- a/charts/kubernetes-agent/templates/tentacle-pvc.yaml
+++ b/charts/kubernetes-agent/templates/tentacle-pvc.yaml
@@ -10,11 +10,13 @@ spec:
     {{- .Values.persistence.accessModes | toYaml | nindent 4 }}
   {{- with .Values.persistence.storageClassName }}
   storageClassName: {{ . | quote }}
-  {{- end }}  
-  {{- with .Values.persistence.volumeName }}
-  volumeName: {{ . | quote }}
+  {{- end }}
+  {{- if .Values.persistence.volumeName }}
+  volumeName: {{ .Values.persistence.volumeName | quote }}
+  {{- else if (lookup "v1" "PersistentVolumeClaim" .Release.Namespace (include "kubernetes-agent.pvcName" .)) }}
+  volumeName: {{ (lookup "v1" "PersistentVolumeClaim" .Release.Namespace (include "kubernetes-agent.pvcName" .)).spec.volumeName }}
   {{- end }}
   resources:
     requests:
       storage: {{ .Values.persistence.size}}
-{{- end }} 
\ No newline at end of file
+{{- end }}