diff --git a/charts/ska-tango-util/templates/_deviceserver-pvc.yaml b/charts/ska-tango-util/templates/_deviceserver-pvc.yaml
index 0ea697f96271db0e39a2a100b86e8723014132db..0ccb66751eb5c314c481650cc6da7a8c06ab9bb0 100644
--- a/charts/ska-tango-util/templates/_deviceserver-pvc.yaml
+++ b/charts/ska-tango-util/templates/_deviceserver-pvc.yaml
@@ -16,7 +16,7 @@ Parameters are:
 {{ define "ska-tango-util.deviceserver-pvc.tpl" }}
 
 ---
-{{- if .volume }}
+{{- if and .volume (not .volume.existingClaimName) }}
 
 {{ $volume_name := .volume.name }}
 {{ $volume_path := .volume.mountPath }}
diff --git a/charts/ska-tango-util/templates/_multidevice-svc.yaml b/charts/ska-tango-util/templates/_multidevice-svc.yaml
index bccd93084050124d7daa9c68b2e9eadb5c5c0f10..855dd3ad4d9013dad385fb6c18e2f8bc510be119 100644
--- a/charts/ska-tango-util/templates/_multidevice-svc.yaml
+++ b/charts/ska-tango-util/templates/_multidevice-svc.yaml
@@ -131,8 +131,8 @@ spec:
             name: {{$deviceserver_name | toString }}-{{ $chart.Release.Name }}-dsconfig-json
         {{ if hasKey $deviceserver "volume" }}
         - name: volume-data
-          persistentVolumeClaim: 
-            claimName: {{ $deviceserver.volume.name | toString }}-pvc-{{ $chart.Release.Name }}
+          persistentVolumeClaim:
+            claimName: {{ $deviceserver.volume.existingClaimName | default (printf "%s-pvc-%s" $deviceserver.volume.name $chart.Release.Name) }}
         {{ end }}
       serviceAccountName: {{ $deviceserver_name | toString }}-sa-{{ $chart.Release.Name }}
       initContainers: