diff --git a/roles/network_plugin/flannel/tasks/main.yml b/roles/network_plugin/flannel/tasks/main.yml
index 9588559f6..9b982df04 100644
--- a/roles/network_plugin/flannel/tasks/main.yml
+++ b/roles/network_plugin/flannel/tasks/main.yml
@@ -11,6 +11,14 @@
     dest: /etc/kubernetes/manifests/flannel-pod.manifest
   notify: delete default docker bridge
 
+- name: Flannel | wait for etcd
+  uri: url=http://localhost:2379/health
+  register: result
+  until: result.status == 200
+  retries: 10
+  delay: 5
+  when: inventory_hostname in groups['kube-master']
+
 - name: Flannel | Wait for flannel subnet.env file presence
   wait_for:
     path: /run/flannel/subnet.env