diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index a098e0c11427d92191b09593394ebcb1e8233c02..5586fc6e7d630e9641b9abecbe2f7b83176f9264 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -34,7 +34,7 @@ kube_proxy_mode: userspace
 
 # Temporary image, waiting for official google release
 #  hyperkube_image_repo: gcr.io/google_containers/hyperkube
-hyperkube_image_repo: quay.io/smana/hyperkube
+hyperkube_image_repo: gcr.io/google_containers/hyperkube
 hyperkube_image_tag: v1.1.3
 
 # IP address of the DNS server.
diff --git a/roles/network_plugin/tasks/flannel.yml b/roles/network_plugin/tasks/flannel.yml
index e0b3391aaa6341b64aa9ba43c4f41c355e5a02b2..fc5dcaa2fae462c92c3df895f29c3a41be01ab63 100644
--- a/roles/network_plugin/tasks/flannel.yml
+++ b/roles/network_plugin/tasks/flannel.yml
@@ -4,7 +4,6 @@
     src: flannel/network.json
     dest: /etc/flannel-network.json
     backup: yes
-  when: inventory_hostname in groups['kube-node']
 
 - name: Flannel | Create flannel pod manifest
   template: