diff --git a/templates/windows10.tpl.yaml b/templates/windows10.tpl.yaml
index 5f6aceee..10bf8b02 100644
--- a/templates/windows10.tpl.yaml
+++ b/templates/windows10.tpl.yaml
@@ -180,7 +180,7 @@ parameters:
 - name: NAME
   description: VM name
   generate: expression
-  from: "windows-[a-z0-9]{6}"
+  from: "windows10-[a-z0-9]{6}"
 - name: DATA_SOURCE_NAME
   description: Name of the DataSource to clone
   value: win10
diff --git a/templates/windows11.tpl.yaml b/templates/windows11.tpl.yaml
index 43e1e159..154f62a4 100644
--- a/templates/windows11.tpl.yaml
+++ b/templates/windows11.tpl.yaml
@@ -192,7 +192,7 @@ parameters:
 - name: NAME
   description: VM name
   generate: expression
-  from: "windows-[a-z0-9]{6}"
+  from: "windows11-[a-z0-9]{6}"
 - name: DATA_SOURCE_NAME
   description: Name of the DataSource to clone
   value: win11
diff --git a/templates/windows2k12.tpl.yaml b/templates/windows2k12.tpl.yaml
index fd1ae48f..f6904c7f 100644
--- a/templates/windows2k12.tpl.yaml
+++ b/templates/windows2k12.tpl.yaml
@@ -181,7 +181,7 @@ parameters:
 - name: NAME
   description: VM name
   generate: expression
-  from: "windows-[a-z0-9]{6}"
+  from: "windows2012-[a-z0-9]{6}"
 - name: DATA_SOURCE_NAME
   description: Name of the DataSource to clone
   value: win2k12r2
diff --git a/templates/windows2k16.tpl.yaml b/templates/windows2k16.tpl.yaml
index c34d8391..78cb4fca 100644
--- a/templates/windows2k16.tpl.yaml
+++ b/templates/windows2k16.tpl.yaml
@@ -180,7 +180,7 @@ parameters:
 - name: NAME
   description: VM name
   generate: expression
-  from: "windows-[a-z0-9]{6}"
+  from: "windows2016-[a-z0-9]{6}"
 - name: DATA_SOURCE_NAME
   description: Name of the DataSource to clone
   value: win2k16
diff --git a/templates/windows2k19.tpl.yaml b/templates/windows2k19.tpl.yaml
index f0afbd51..78aac132 100644
--- a/templates/windows2k19.tpl.yaml
+++ b/templates/windows2k19.tpl.yaml
@@ -180,7 +180,7 @@ parameters:
 - name: NAME
   description: VM name
   generate: expression
-  from: "windows-[a-z0-9]{6}"
+  from: "windows2019-[a-z0-9]{6}"
 - name: DATA_SOURCE_NAME
   description: Name of the DataSource to clone
   value: win2k19
diff --git a/templates/windows2k22.tpl.yaml b/templates/windows2k22.tpl.yaml
index b886dc29..c0a35723 100644
--- a/templates/windows2k22.tpl.yaml
+++ b/templates/windows2k22.tpl.yaml
@@ -186,7 +186,7 @@ parameters:
 - name: NAME
   description: VM name
   generate: expression
-  from: "windows-[a-z0-9]{6}"
+  from: "windows2022-[a-z0-9]{6}"
 - name: DATA_SOURCE_NAME
   description: Name of the DataSource to clone
   value: win2k22