diff --git a/templates/fedora28.yaml b/templates/fedora28.yaml
index a317a188..c8a79212 100644
--- a/templates/fedora28.yaml
+++ b/templates/fedora28.yaml
@@ -15,8 +15,8 @@ metadata:
     tags: "kubevirt,virtualmachine,fedora,rhel"
     iconClass: "icon-fedora"
     openshift.io/provider-display-name: "KubeVirt"
-    openshift.io/documentation-url: "https://github.com/fabiand/common-templates"
-    openshift.io/support-url: "https://github.com/fabiand/common-templates/issues"
+    openshift.io/documentation-url: "https://github.com/kubevirt/common-templates"
+    openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
     template.cnv.io/version: v1alpha1
diff --git a/templates/opensuse15.yaml b/templates/opensuse15.yaml
index 4d174824..bc54188e 100644
--- a/templates/opensuse15.yaml
+++ b/templates/opensuse15.yaml
@@ -15,8 +15,8 @@ metadata:
     tags: "kubevirt,virtualmachine,linux,opensuse"
     iconClass: "icon-fedora"
     openshift.io/provider-display-name: "KubeVirt"
-    openshift.io/documentation-url: "https://github.com/fabiand/common-templates"
-    openshift.io/support-url: "https://github.com/fabiand/common-templates/issues"
+    openshift.io/documentation-url: "https://github.com/kubevirt/common-templates"
+    openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
     template.cnv.io/version: v1alpha1
diff --git a/templates/rhel75-hp.yaml b/templates/rhel75-hp.yaml
index d8d16505..9d68fa62 100644
--- a/templates/rhel75-hp.yaml
+++ b/templates/rhel75-hp.yaml
@@ -14,8 +14,8 @@ metadata:
     tags: "kubevirt,virtualmachine,linux,rhel,high-performance"
     iconClass: "icon-rhel"
     openshift.io/provider-display-name: "KubeVirt"
-    openshift.io/documentation-url: "https://github.com/fabiand/common-templates"
-    openshift.io/support-url: "https://github.com/fabiand/common-templates/issues"
+    openshift.io/documentation-url: "https://github.com/kubevirt/common-templates"
+    openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
     template.cnv.io/version: v1alpha1
diff --git a/templates/rhel75.yaml b/templates/rhel75.yaml
index c7b2f502..35776d7d 100644
--- a/templates/rhel75.yaml
+++ b/templates/rhel75.yaml
@@ -13,8 +13,8 @@ metadata:
     tags: "kubevirt,virtualmachine,linux,rhel"
     iconClass: "icon-rhel"
     openshift.io/provider-display-name: "KubeVirt"
-    openshift.io/documentation-url: "https://github.com/fabiand/common-templates"
-    openshift.io/support-url: "https://github.com/fabiand/common-templates/issues"
+    openshift.io/documentation-url: "https://github.com/kubevirt/common-templates"
+    openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
     template.cnv.io/version: v1alpha1
diff --git a/templates/ubuntu1804.yaml b/templates/ubuntu1804.yaml
index b6c31b18..360ddc0a 100644
--- a/templates/ubuntu1804.yaml
+++ b/templates/ubuntu1804.yaml
@@ -15,8 +15,8 @@ metadata:
     tags: "kubevirt,virtualmachine,ubuntu"
     iconClass: "icon-ubuntu"
     openshift.io/provider-display-name: "KubeVirt"
-    openshift.io/documentation-url: "https://github.com/fabiand/common-templates"
-    openshift.io/support-url: "https://github.com/fabiand/common-templates/issues"
+    openshift.io/documentation-url: "https://github.com/kubevirt/common-templates"
+    openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
     template.cnv.io/version: v1alpha1
diff --git a/templates/win2k12r2.yaml b/templates/win2k12r2.yaml
index de37274d..05b96f66 100644
--- a/templates/win2k12r2.yaml
+++ b/templates/win2k12r2.yaml
@@ -12,8 +12,8 @@ metadata:
     tags: "kubevirt,virtualmachine,windows"
     iconClass: "icon-windows"
     openshift.io/provider-display-name: "KubeVirt"
-    openshift.io/documentation-url: "https://github.com/fabiand/common-templates"
-    openshift.io/support-url: "https://github.com/fabiand/common-templates/issues"
+    openshift.io/documentation-url: "https://github.com/kubevirt/common-templates"
+    openshift.io/support-url: "https://github.com/kubevirt/common-templates/issues"
     template.openshift.io/bindable: "false"
 
     template.cnv.io/version: v1alpha1