diff --git a/deploy/test-vm.yaml b/deploy/test-vm.yaml
index 5d55076..e3380cd 100644
--- a/deploy/test-vm.yaml
+++ b/deploy/test-vm.yaml
@@ -20,7 +20,15 @@ spec:
         mac: "00:16:3e:33:59:10"
     disks:
     - volumeClaimTemplate:
+#        metadata:
+#          name: test-vm-system
         spec:
+          storageClassName: ""
+          selector:
+            matchLabels:
+              app.kubernetes.io/name: vmrunner
+              app.kubernetes.io/instance: test-vm
+              vmrunner.jdrupes.org/disk: system
           resources:
             requests:
               storage: 40Gi
diff --git a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
index 4e27f9b..cdfd468 100644
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
@@ -32,12 +32,12 @@ spec:
     <#list cr.spec.vm.disks.asList() as disk>
     <#if disk.volumeClaimTemplate.metadata??
       && disk.volumeClaimTemplate.metadata.name??>
-      <#assign name = disk.volumeClaimTemplate.metadata.name.asString>
+      <#assign diskName = "disk-" + disk.volumeClaimTemplate.metadata.name.asString>
     <#else>
-      <#assign name = "" + diskCounter>
+      <#assign diskName = "disk-" + diskCounter>
     </#if>
-    - name: disk-${ name }
-      devicePath: /dev/disk-${ name }
+    - name: ${ diskName }
+      devicePath: /dev/${ diskName }
     <#assign diskCounter = diskCounter + 1/>
     </#list>
     securityContext:
@@ -65,13 +65,15 @@ spec:
   <#list cr.spec.vm.disks.asList() as disk>
   <#if disk.volumeClaimTemplate.metadata??
     && disk.volumeClaimTemplate.metadata.name??>
-    <#assign name = disk.volumeClaimTemplate.metadata.name.asString>
+    <#assign claimName = disk.volumeClaimTemplate.metadata.name.asString>
+    <#assign diskName = "disk-" + claimName>
   <#else>
-    <#assign name = "" + diskCounter>
+    <#assign claimName = cr.metadata.name.asString + "-disk-" + diskCounter>
+    <#assign diskName = "disk-" + diskCounter>
   </#if>
-  - name: disk-${ name }
+  - name: ${ diskName }
     persistentVolumeClaim:
-      claimName: ${ cr.metadata.name.asString }-disk-${ name }
+      claimName: ${ claimName }
   <#assign diskCounter = diskCounter + 1/>
   </#list>
   hostNetwork: true