diff --git a/templates/windowsserver/flavor/small.yaml b/templates/windowsserver/flavor/small.yaml
index e97c5f2..67a0223 100644
--- a/templates/windowsserver/flavor/small.yaml
+++ b/templates/windowsserver/flavor/small.yaml
@@ -16,11 +16,11 @@ objects:
   - apiVersion: kubevirt.io/v1
     kind: VirtualMachine
     metadata:
-      name: '${NAME}'
+      name: windows-server-demo
       annotations:
         description: Windows Server 2022 VM Demo
       labels:
-        app: '${NAME}'
+        app: windows-server-demo
         vm.kubevirt.io/template: 'windows-server-2022-template'
         os.template.kubevirt.io/win2k22: 'true'
     spec:
@@ -32,7 +32,7 @@ objects:
             vm.kubevirt.io/os: win2k22
             vm.kubevirt.io/workload: server
           labels:
-            kubevirt.io/domain: '${NAME}'
+            kubevirt.io/domain: windows-server-demo
             kubevirt.io/size: small
         spec:
           domain:
@@ -60,7 +60,7 @@ objects:
                 efi: {}
             memory:
               guest: 4Gi
-          hostname: '${NAME}'
+          hostname: windows-server-demo
           networks:
             - name: default
               pod: {}
@@ -68,11 +68,11 @@ objects:
           volumes:
             - name: rootdisk
               dataVolume:
-                name: '${NAME}-datavolume'
+                name: windows-server-datavolume-small
   - apiVersion: cdi.kubevirt.io/v1beta1
     kind: DataVolume
     metadata:
-      name: '${NAME}-datavolume'
+      name: windows-server-datavolume-small
       namespace: '${TENANT_NAMESPACE}'
     spec:
       source:
@@ -85,10 +85,6 @@ objects:
           requests:
             storage: '${PVC_SIZE}'
 parameters:
-  - name: NAME
-    description: Name for the new VM
-    required: true
-    value: windows-server-2022
   - name: IMAGE_URL
     description: Public or internal HTTP(S) URL to a sysprepped Windows .qcow2 image
     required: true