diff --git a/templates/windowsserver/dv/windows-1-dv.yaml b/templates/windowsserver/dv/windows-1-dv.yaml
deleted file mode 100644
index e1401ff..0000000
--- a/templates/windowsserver/dv/windows-1-dv.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: cdi.kubevirt.io/v1beta1
-kind: DataVolume
-metadata:
-  name: windows-server-datavolume
-  namespace: ${TENANT_NAMESPACE}
-spec:
-  source:
-    http:
-      url: "https://nginx-demo.apps.ai-2.kvant.cloud/win2022.qcow2"
-  pvc:
-    accessModes:
-      - ReadWriteOnce
-    resources:
-      requests:
-        storage: 120Gi
\ No newline at end of file
diff --git a/templates/windowsserver/flavor/small.yaml b/templates/windowsserver/flavor/small.yaml
index fc3604f..e03e616 100644
--- a/templates/windowsserver/flavor/small.yaml
+++ b/templates/windowsserver/flavor/small.yaml
@@ -4,18 +4,16 @@ metadata:
   name: windows-server-2022-small
   namespace: ${TENANT_NAMESPACE}
   annotations:
-    openshift.io/display-name: "Windows Server 2022 VM"
-    openshift.io/documentation-url: "https://docs.microsoft.com/en-us/windows-server/"
-    description: "Template for deploying a Windows Server 2022 Virtual Machine on OpenShift with KubeVirt."
-    tags: virtualmachine,windows,server,2022
+    description: "Windows Server 2022 Standard VM 
+    openshift.io/display-name: Windows Server 2022
+    openshift.io/provider-display-name: Phoenix Systems AG
+    tags: virtualmachine,windows,2022
 objects:
   - apiVersion: kubevirt.io/v1
     kind: VirtualMachine
     metadata:
       name: ${VM_NAME}
       namespace: ${TENANT_NAMESPACE}
-      labels:
-        app: windows-server
     spec:
       running: false
       template:
@@ -25,26 +23,42 @@ objects:
         spec:
           domain:
             cpu:
-              cores: 4
+              cores: 2
+            memory:
+              guest: 4Gi
             devices:
               disks:
                 - name: rootdisk
                   disk:
                     bus: virtio
-            memory:
-              guest: 8Gi
           networks:
             - name: default
               pod: {}
           volumes:
             - name: rootdisk
-              persistentVolumeClaim:
-                claimName: windows-server-datavolume
+              dataVolume:
+                name: ${VM_NAME}-datavolume
+  - apiVersion: cdi.kubevirt.io/v1beta1
+    kind: DataVolume
+    metadata:
+      name: ${VM_NAME}-datavolume
+      namespace: ${NAMESPACE}
+    spec:
+      source:
+        http:
+          url: ${IMAGE_URL}
+      pvc:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: ${PVC_SIZE}
 parameters:
-  - name: windows_server_2022_small
-    description: Name of the Virtual Machine
+  - name: IMAGE_URL
+    description: URL to your image repository
     required: true
-  - name: NAMESPACE
-    description: Namespace where to deploy
+    value: https://nginx.demo.pub.ai-2.kvant.cloud.apps.ai-2.kvant.cloud/win2022.qcow2
+  - name: PVC_SIZE
+    description: PVC size (GiB)
     required: true
-    value: ${TENANT_NAMESPACE}
\ No newline at end of file
+    value: 120Gi
diff --git a/templates/windowsserver/ks-dv.yaml b/templates/windowsserver/ks-dv.yaml
deleted file mode 100644
index 3cfa0f1..0000000
--- a/templates/windowsserver/ks-dv.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app dv
-  namespace: ${TENANT_NAMESPACE}
-spec:
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./templates/windowsserver/dv
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: tenant-repos
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m