diff --git a/templates/centos6.tpl.yaml b/templates/centos6.tpl.yaml
index 12a76314..cb558b5a 100644
--- a/templates/centos6.tpl.yaml
+++ b/templates/centos6.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "CentOS 6.0+ VM"
     description: >-
diff --git a/templates/centos7.tpl.yaml b/templates/centos7.tpl.yaml
index fe42fbf8..350207dc 100644
--- a/templates/centos7.tpl.yaml
+++ b/templates/centos7.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "CentOS 7.0+ VM"
     description: >-
diff --git a/templates/fedora.tpl.yaml b/templates/fedora.tpl.yaml
index 4d0fc4f6..84f0f215 100644
--- a/templates/fedora.tpl.yaml
+++ b/templates/fedora.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "Fedora 23+ VM"
     description: >-
diff --git a/templates/opensuse.tpl.yaml b/templates/opensuse.tpl.yaml
index e77e0a1e..c026c1b7 100644
--- a/templates/opensuse.tpl.yaml
+++ b/templates/opensuse.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "OpenSUSE Leap 15.0 VM"
     description: >-
diff --git a/templates/rhel6.tpl.yaml b/templates/rhel6.tpl.yaml
index 117b64e6..cc51777d 100644
--- a/templates/rhel6.tpl.yaml
+++ b/templates/rhel6.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "Red Hat Enterprise Linux 6.0+ VM"
     description: >-
diff --git a/templates/rhel7.tpl.yaml b/templates/rhel7.tpl.yaml
index 5831963c..02b37781 100644
--- a/templates/rhel7.tpl.yaml
+++ b/templates/rhel7.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "Red Hat Enterprise Linux 7.0+ VM"
     description: >-
diff --git a/templates/ubuntu.tpl.yaml b/templates/ubuntu.tpl.yaml
index 3cbe2c4b..9112f3fc 100644
--- a/templates/ubuntu.tpl.yaml
+++ b/templates/ubuntu.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "Ubuntu 18.04 (Xenial Xerus) VM"
     description: >-
diff --git a/templates/win2k12r2.tpl.yaml b/templates/win2k12r2.tpl.yaml
index e323ba52..615a8d72 100644
--- a/templates/win2k12r2.tpl.yaml
+++ b/templates/win2k12r2.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: win2k12r2-{{ item.workload }}-{{ item.flavor }}
+  name: win2k12r2-{{ item.workload }}-{{ item.flavor }}-v0.7.0
   annotations:
     openshift.io/display-name: "Microsoft Windows Server 2012 R2 VM"
     description: >-