diff --git a/templates/LABELS.md b/templates/LABELS.md
index 55961f02..8aeb1ea5 100644
--- a/templates/LABELS.md
+++ b/templates/LABELS.md
@@ -13,80 +13,80 @@ identifiers](https://gitlab.com/libosinfo/osinfo-db/tree/master/data/os) from th
 
 ### Ubuntu
 
-- os.template.cnv.io/ubuntu18.04
-- os.template.cnv.io/ubuntu17.10
-- os.template.cnv.io/ubuntu17.04
-- os.template.cnv.io/ubuntu16.10
-- os.template.cnv.io/ubuntu16.04
+- os.template.kubevirt.io/ubuntu18.04
+- os.template.kubevirt.io/ubuntu17.10
+- os.template.kubevirt.io/ubuntu17.04
+- os.template.kubevirt.io/ubuntu16.10
+- os.template.kubevirt.io/ubuntu16.04
 
 ### Fedora
 
-- os.template.cnv.io/fedora29
-- os.template.cnv.io/fedora28
-- os.template.cnv.io/fedora27
-- os.template.cnv.io/fedora26
-- os.template.cnv.io/fedora25
-- os.template.cnv.io/fedora24
-- os.template.cnv.io/fedora23
+- os.template.kubevirt.io/fedora29
+- os.template.kubevirt.io/fedora28
+- os.template.kubevirt.io/fedora27
+- os.template.kubevirt.io/fedora26
+- os.template.kubevirt.io/fedora25
+- os.template.kubevirt.io/fedora24
+- os.template.kubevirt.io/fedora23
 
 ### CentOS
 
-- os.template.cnv.io/centos7.0
-- os.template.cnv.io/centos6.9
-- os.template.cnv.io/centos6.8
-- os.template.cnv.io/centos6.7
+- os.template.kubevirt.io/centos7.0
+- os.template.kubevirt.io/centos6.9
+- os.template.kubevirt.io/centos6.8
+- os.template.kubevirt.io/centos6.7
 
 ### Red Hat Enterprise Linux
 
-- os.template.cnv.io/rhel7.0
-- os.template.cnv.io/rhel7.1
-- os.template.cnv.io/rhel7.2
-- os.template.cnv.io/rhel7.3
-- os.template.cnv.io/rhel7.4
-- os.template.cnv.io/rhel7.5
-- os.template.cnv.io/rhel6.0
-- os.template.cnv.io/rhel6.1
-- os.template.cnv.io/rhel6.2
-- os.template.cnv.io/rhel6.3
-- os.template.cnv.io/rhel6.4
-- os.template.cnv.io/rhel6.5
-- os.template.cnv.io/rhel6.6
-- os.template.cnv.io/rhel6.7
-- os.template.cnv.io/rhel6.8
-- os.template.cnv.io/rhel6.9
-- os.template.cnv.io/rhel6.10
+- os.template.kubevirt.io/rhel7.0
+- os.template.kubevirt.io/rhel7.1
+- os.template.kubevirt.io/rhel7.2
+- os.template.kubevirt.io/rhel7.3
+- os.template.kubevirt.io/rhel7.4
+- os.template.kubevirt.io/rhel7.5
+- os.template.kubevirt.io/rhel6.0
+- os.template.kubevirt.io/rhel6.1
+- os.template.kubevirt.io/rhel6.2
+- os.template.kubevirt.io/rhel6.3
+- os.template.kubevirt.io/rhel6.4
+- os.template.kubevirt.io/rhel6.5
+- os.template.kubevirt.io/rhel6.6
+- os.template.kubevirt.io/rhel6.7
+- os.template.kubevirt.io/rhel6.8
+- os.template.kubevirt.io/rhel6.9
+- os.template.kubevirt.io/rhel6.10
 
 ### openSUSE
 
-- os.template.cnv.io/opensuse15.0
+- os.template.kubevirt.io/opensuse15.0
 
 ### Microsoft Windows
 
-- os.template.cnv.io/win2k16
-- os.template.cnv.io/win2k12r2
-- os.template.cnv.io/win2k12
-- os.template.cnv.io/win2k8r2
-- os.template.cnv.io/win2k8
-- os.template.cnv.io/win10
-- os.template.cnv.io/win8.1
-- os.template.cnv.io/win8
-- os.template.cnv.io/win7
-- os.template.cnv.io/winvista
-- os.template.cnv.io/winxp
+- os.template.kubevirt.io/win2k16
+- os.template.kubevirt.io/win2k12r2
+- os.template.kubevirt.io/win2k12
+- os.template.kubevirt.io/win2k8r2
+- os.template.kubevirt.io/win2k8
+- os.template.kubevirt.io/win10
+- os.template.kubevirt.io/win8.1
+- os.template.kubevirt.io/win8
+- os.template.kubevirt.io/win7
+- os.template.kubevirt.io/winvista
+- os.template.kubevirt.io/winxp
 
 ## Workload profiles
 
-- workload.template.cnv.io/desktop
-- workload.template.cnv.io/server
-- workload.template.cnv.io/cpu-intensive
-- workload.template.cnv.io/io-intensive
-- workload.template.cnv.io/sap-hana
+- workload.template.kubevirt.io/desktop
+- workload.template.kubevirt.io/server
+- workload.template.kubevirt.io/cpu-intensive
+- workload.template.kubevirt.io/io-intensive
+- workload.template.kubevirt.io/sap-hana
 
 ## Flavors
 
-- flavor.template.cnv.io/tiny
-- flavor.template.cnv.io/small
-- flavor.template.cnv.io/medium
-- flavor.template.cnv.io/large
-- flavor.template.cnv.io/xlarge
+- flavor.template.kubevirt.io/tiny
+- flavor.template.kubevirt.io/small
+- flavor.template.kubevirt.io/medium
+- flavor.template.kubevirt.io/large
+- flavor.template.kubevirt.io/xlarge
 
diff --git a/templates/README.md b/templates/README.md
index 7258d03e..e4480cff 100644
--- a/templates/README.md
+++ b/templates/README.md
@@ -6,7 +6,7 @@ Since the templates will contain lots of redundancies, there should be a build t
 
 Also, there might be multiple different OSes, flavors, sizes mentioned by any single template file if they share the same configuration.
 
-Please note that the cnv.io suffix used in labels and annotations is temporary and is likely to change.
+Please note that the kubevirt.io suffix used in labels and annotations is temporary and is likely to change.
 
 ## User Experience
 
@@ -32,12 +32,12 @@ metadata:
     openshift.io/long-description: >-
       Long description of the template
     openshift.io/provider-display-name: "Red Hat, Inc."
-    openshift.io/documentation-url: "https://cnv.io/..."
+    openshift.io/documentation-url: "https://kubevirt.io/..."
     openshift.io/support-url: "https://access.redhat.com"
     iconClass: icon-windows    
 
     # Template structure version
-    template.cnv.io/version: v1alpha1
+    template.kubevirt.io/version: v1alpha1
 
     # The `defaults` set of annotations is meant as a hint only
     # and is not going to be processed by the stock openshift templating
@@ -49,28 +49,28 @@ metadata:
     # The goal of default disk is to define what kind of disk
     # is supported by the OS mainly in terms of bus (ide, scsi,
     # sata, virtio, ...)
-    defaults.template.cnv.io/disk: default-disk
+    defaults.template.kubevirt.io/disk: default-disk
 
     # The goal of default volume is to be able to configure mostly
     # performance parameters like caches if those are exposed
     # by the underlying volume implementation.
-    defaults.template.cnv.io/volume: default-volume
+    defaults.template.kubevirt.io/volume: default-volume
 
     # The goal of default network is similar to default-disk
     # and should be used as a template to ensure OS compatibility
     # and performance
-    defaults.template.cnv.io/nic: default-nic
+    defaults.template.kubevirt.io/nic: default-nic
 
     # The goal of default network is similar to default-volume
     # and should be used as a template that specifies performance
     # and connection parameters (L2 bridge for example)
-    defaults.template.cnv.io/network: default-network
+    defaults.template.kubevirt.io/network: default-network
 
     # Extension for hinting at which elements should be
     # considered editable. The content is a line separated
     # list of jsonpath selectors.
     # The jsonpath root is the objects: element of the template
-    template.cnv.io/editable: |
+    template.kubevirt.io/editable: |
       /objects[0].spec.template.spec.domain.cpu.cores
       /objects[0].spec.template.spec.domain.resources.requests.memory
       /objects[0].spec.template.spec.domain.devices.disks
@@ -82,34 +82,34 @@ metadata:
     # See the separate 'VALIDATION.md' document for the specification.
 
   labels:
-    # The UI can show all possible template.cnv.io/* values in a nice way
+    # The UI can show all possible template.kubevirt.io/* values in a nice way
     # and let the user filter down the available templates to the one
     # the user actually wants:
     # A single selected template only means no conflicts and no smart
     # merging code. This has to be done using labels to allow efficient
     # searching.
     # The format has the following meaning:
-    # {os,flavor,size}.template.cnv.io/{value}: true (or false for exclusion)
+    # {os,flavor,size}.template.kubevirt.io/{value}: true (or false for exclusion)
     # OS names should match the libosinfo identifiers
     # flavors are tiny, medium, large, etc.
     # workloads are desktop, server, high-performance, io-intensive,
     #               oracle-db, sap-hana...
-    os.template.cnv.io/windows2k12r2: "true"
-    os.template.cnv.io/windows8: "true"
-    os.template.cnv.io/windows7: "true"
-    workload.template.cnv.io/minimal: "true"
-    workload.template.cnv.io/io-intensive: "true"
-    # flavor.template.cnv.io/* not specified means all
+    os.template.kubevirt.io/windows2k12r2: "true"
+    os.template.kubevirt.io/windows8: "true"
+    os.template.kubevirt.io/windows7: "true"
+    workload.template.kubevirt.io/minimal: "true"
+    workload.template.kubevirt.io/io-intensive: "true"
+    # flavor.template.kubevirt.io/* not specified means all
     # And example of not specifying any positive requirement
     # but listing the exclusions instead (matches all except
     # the listed false valued labels).
-    flavor.template.cnv.io/tiny: "false"
+    flavor.template.kubevirt.io/tiny: "false"
 
     # CNV Template type to separate the use cases for base OS,
     # flavor, sizing templates and templates created from
     # running or imported VMs.
     # The supported values are currently: base and vm
-    template.cnv.io/type: "base"
+    template.kubevirt.io/type: "base"
 
 # Parameters must come from a subset of well known names
 # so the UI can properly work with those.
@@ -140,7 +140,7 @@ objects:
           devices:
             disks:
             # This should be interpreted as a template disk by the UI,
-            # thanks to the template.cnv.io/default annotations
+            # thanks to the template.kubevirt.io/default annotations
             # This must still result in a bootable VM when used as is.
             # This way we can both use Templates for creating new VM as well
             # as for converting an existing VM to a template
@@ -151,7 +151,7 @@ objects:
 
             interfaces:
             # This should be interpreted as a template network by the UI,
-            # thanks to the template.cnv.io/default annotations
+            # thanks to the template.kubevirt.io/default annotations
             # This must still result in a bootable VM when used as is.
             # This way we can both use Templates for creating new VM as well
             # as for converting an existing VM to a template
@@ -167,7 +167,7 @@ objects:
 
         volumes:
             # This should be interpreted as a template volume by the UI,
-            # thanks to the template.cnv.io/default annotations
+            # thanks to the template.kubevirt.io/default annotations
             # This must still result in a bootable VM when used as is.
             # This way we can both use Templates for creating new VM as well
             # as for converting an existing VM to a template
@@ -192,7 +192,7 @@ metadata:
     # Arbitrary format as needed to be able to
     # repopulate the UI or the template processor
     # and get the same output
-    parameters.template.cnv.io/MEMORY_SIZE: 8
+    parameters.template.kubevirt.io/MEMORY_SIZE: 8
 
     # Extension for specifying which elements were customized.
     # The idea is to record fields that need to be preserved
@@ -200,7 +200,7 @@ metadata:
     # editing or upgrade.
     # The content is a line separated list of jsonpath selectors.
     # The jsonpath root is the spec: element of the VM object
-    template.cnv.io/keep: |
+    template.kubevirt.io/keep: |
       /template.spec.domain.cpu.cores
       /template.spec.domain.resources.requests.memory
       /template.spec.domain.devices.disks
@@ -213,13 +213,13 @@ metadata:
     # or UI for recomputing the VM.spec using updated
     # template. A VM without this label can be considered
     # "baked" and not linked to any template.
-    vm.cnv.io/template: windows
+    vm.kubevirt.io/template: windows
 
     # This optional label will link the VM to the namespace
     # of a template that was used to create it.
     # If this label is not defined, the template is 
     # expected to belong to the same namespace as the VM.
-    vm.cnv.io/template-namespace: openshift
+    vm.kubevirt.io/template-namespace: openshift
 
 # The requested state of the VM that will always match what
 # the user asked for exactly. When the UI pushes edits it
diff --git a/templates/_linux.yaml b/templates/_linux.yaml
index 589dd0c8..14409aa0 100644
--- a/templates/_linux.yaml
+++ b/templates/_linux.yaml
@@ -4,9 +4,9 @@
     openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
-    template.cnv.io/version: v1alpha1
-    defaults.template.cnv.io/disk: rootdisk
-    template.cnv.io/editable: |
+    template.kubevirt.io/version: v1alpha1
+    defaults.template.kubevirt.io/disk: rootdisk
+    template.kubevirt.io/editable: |
       /objects[0].spec.template.spec.domain.cpu.sockets
       /objects[0].spec.template.spec.domain.cpu.cores
       /objects[0].spec.template.spec.domain.cpu.threads
@@ -16,16 +16,16 @@
       /objects[0].spec.template.spec.networks
 
 {% for osl in oslabels %}
-    name.os.template.cnv.io/{{ osl }}: {{ lookup('osinfo', osl).name }}
+    name.os.template.kubevirt.io/{{ osl }}: {{ lookup('osinfo', osl).name }}
 {% endfor %}
 
   labels:
 {% for osl in oslabels %}
-    os.template.cnv.io/{{ osl }}: "true"
+    os.template.kubevirt.io/{{ osl }}: "true"
 {% endfor %}
-    workload.template.cnv.io/{{ item.workload }}: "true"
-    flavor.template.cnv.io/{{ item.flavor }}: "true"
-    template.cnv.io/type: "base"
+    workload.template.kubevirt.io/{{ item.workload }}: "true"
+    flavor.template.kubevirt.io/{{ item.flavor }}: "true"
+    template.kubevirt.io/type: "base"
 
 objects:
 - apiVersion: kubevirt.io/v1alpha3
@@ -33,7 +33,7 @@ objects:
   metadata:
     name: ${NAME}
     labels:
-      vm.cnv.io/template: {{ os }}-{{ item.workload }}-{{ item.flavor }}
+      vm.kubevirt.io/template: {{ os }}-{{ item.workload }}-{{ item.flavor }}
       app: ${NAME}
   spec:
     running: false
diff --git a/templates/win2k12r2.tpl.yaml b/templates/win2k12r2.tpl.yaml
index bdf5ad03..557ba318 100644
--- a/templates/win2k12r2.tpl.yaml
+++ b/templates/win2k12r2.tpl.yaml
@@ -16,29 +16,29 @@ metadata:
     openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
-    template.cnv.io/version: v1alpha1
-    defaults.template.cnv.io/disk: rootdisk
-    defaults.template.cnv.io/network: default
-    template.cnv.io/editable: |
+    template.kubevirt.io/version: v1alpha1
+    defaults.template.kubevirt.io/disk: rootdisk
+    defaults.template.kubevirt.io/network: default
+    template.kubevirt.io/editable: |
       /objects[0].spec.template.spec.domain.cpu.cores
       /objects[0].spec.template.spec.domain.resources.requests.memory
       /objects[0].spec.template.spec.domain.devices.disks
       /objects[0].spec.template.spec.volumes
       /objects[0].spec.template.spec.networks
 
-    name.os.template.cnv.io/win2k12r2: {{ lookup('osinfo', 'win2k12r2').name }}
-    name.os.template.cnv.io/win2k8r2: {{ lookup('osinfo', 'win2k8r2').name }}
-    name.os.template.cnv.io/win2k8: {{ lookup('osinfo', 'win2k8').name }}
-    name.os.template.cnv.io/win10: {{ lookup('osinfo', 'win10').name }}
+    name.os.template.kubevirt.io/win2k12r2: {{ lookup('osinfo', 'win2k12r2').name }}
+    name.os.template.kubevirt.io/win2k8r2: {{ lookup('osinfo', 'win2k8r2').name }}
+    name.os.template.kubevirt.io/win2k8: {{ lookup('osinfo', 'win2k8').name }}
+    name.os.template.kubevirt.io/win10: {{ lookup('osinfo', 'win10').name }}
 
   labels:
-    os.template.cnv.io/win2k12r2: "true"
-    os.template.cnv.io/win2k8r2: "true"
-    os.template.cnv.io/win2k8: "true"
-    os.template.cnv.io/win10: "true"
-    workload.template.cnv.io/{{ item.workload }}: "true"
-    flavor.template.cnv.io/{{ item.flavor }}: "true"
-    template.cnv.io/type: "base"
+    os.template.kubevirt.io/win2k12r2: "true"
+    os.template.kubevirt.io/win2k8r2: "true"
+    os.template.kubevirt.io/win2k8: "true"
+    os.template.kubevirt.io/win10: "true"
+    workload.template.kubevirt.io/{{ item.workload }}: "true"
+    flavor.template.kubevirt.io/{{ item.flavor }}: "true"
+    template.kubevirt.io/type: "base"
 
 objects:
 - apiVersion: kubevirt.io/v1alpha3
@@ -46,7 +46,7 @@ objects:
   metadata:
     name: ${NAME}
     labels:
-      vm.cnv.io/template: win2k12r2-{{ item.workload }}-{{ item.flavor }}
+      vm.kubevirt.io/template: win2k12r2-{{ item.workload }}-{{ item.flavor }}
       app: ${NAME}
   spec:
     running: false