diff --git a/roles/kubespray_defaults/defaults/main/download.yml b/roles/kubespray_defaults/defaults/main/download.yml
index f29d186a2..1cfdffa96 100644
--- a/roles/kubespray_defaults/defaults/main/download.yml
+++ b/roles/kubespray_defaults/defaults/main/download.yml
@@ -211,9 +211,9 @@ skopeo_binary_checksum: "{{ skopeo_binary_checksums[image_arch][skopeo_version]
 kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy"
 etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
 etcd_image_tag: "v{{ etcd_version }}"
-flannel_image_repo: "{{ docker_image_repo }}/flannel/flannel"
-flannel_image_tag: "{{ '' if flannel_version is version('0.28.6', '>=') and flannel_version is version('0.28.10', '<') else 'v' }}{{ flannel_version }}"
-flannel_init_image_repo: "{{ docker_image_repo }}/flannel/flannel-cni-plugin"
+flannel_image_repo: "{{ github_image_repo }}/flannel-io/flannel"
+flannel_image_tag: "v{{ flannel_version }}"
+flannel_init_image_repo: "{{ github_image_repo }}/flannel-io/flannel-cni-plugin"
 flannel_init_image_tag: "v{{ flannel_cni_version }}"
 calico_node_image_repo: "{{ quay_image_repo }}/calico/node"
 calico_node_image_tag: "v{{ calico_version }}"
diff --git a/tests/common_vars.yml b/tests/common_vars.yml
index 2bfad2625..e0d6f34cc 100644
--- a/tests/common_vars.yml
+++ b/tests/common_vars.yml
@@ -30,9 +30,6 @@ crio_registries:
 
 nginx_image_repo: "{{ quay_image_repo }}/kubespray/nginx"
 
-flannel_image_repo: "{{ quay_image_repo }}/kubespray/flannel"
-flannel_init_image_repo: "{{ quay_image_repo }}/kubespray/flannel-cni-plugin"
-
 local_release_dir: "{{ '/tmp/releases' if inventory_hostname != 'localhost' else (lookup('env', 'PWD') + '/downloads') }}"
 
 hydrophone_version: "0.7.0"