diff --git a/test/ix-chart/2101.0.0/templates/_volumes.tpl b/test/ix-chart/2101.0.0/templates/_volumes.tpl
index e16e1c4c8d..ff54f173eb 100644
--- a/test/ix-chart/2101.0.0/templates/_volumes.tpl
+++ b/test/ix-chart/2101.0.0/templates/_volumes.tpl
@@ -10,13 +10,15 @@ volumes:
       path: {{ $hostPathConfiguration.hostPath }}
 {{- end }}
 {{- range $index, $hostPathConfiguration := .Values.ixVolumes }}
-  - name: ix-host-volume-{{ $.Release.Name }}-{{ $index }}
+{{ $dsName := base $hostPathConfiguration.hostPath }}
+  - name: ix-host-volume-{{ $.Release.Name }}-{{ $dsName }}
     hostPath:
       path: {{ $hostPathConfiguration.hostPath }}
 {{- end }}
 {{- end }}
 {{- end }}
 
+
 {{/*
 Volume Mounts Configuration
 */}}
@@ -28,9 +30,9 @@ volumeMounts:
     name: ix-host-path-{{ $.Release.Name }}-{{ $index }}
     readOnly: {{ $hostPathConfiguration.readOnly }}
   {{- end }}
-  {{- range $index, $hostPathConfiguration := .Values.ixVolumes }}
+  {{- range $index, $hostPathConfiguration := .Values.volumes }}
   - mountPath: {{ $hostPathConfiguration.mountPath }}
-    name: ix-host-volume-{{ $.Release.Name }}-{{ $index }}
+    name: ix-host-volume-{{ $.Release.Name }}-{{ $hostPathConfiguration.datasetName }}
   {{- end }}
 {{- end }}
 {{- end }}