diff --git a/roles/etcd/tasks/install_host.yml b/roles/etcd/tasks/install_host.yml
index 0f5f5d3d8713646fff6524b006fb71a709fc87a8..3196df5c617d5afdb4569346c2ba1a2d337e6126 100644
--- a/roles/etcd/tasks/install_host.yml
+++ b/roles/etcd/tasks/install_host.yml
@@ -1,4 +1,13 @@
 ---
+- name: install | Download etcd and etcdctl
+  include_tasks: "../../download/tasks/download_file.yml"
+  vars:
+    download: "{{ download_defaults | combine(downloads.etcd) }}"
+  when: etcd_cluster_setup
+  tags:
+    - never
+    - etcd
+
 - name: install | Copy etcd and etcdctl binary from download dir
   copy:
     src: "{{ local_release_dir }}/etcd-{{ etcd_version }}-linux-{{ host_architecture }}/{{ item }}"
@@ -6,6 +15,6 @@
     mode: 0755
     remote_src: yes
   with_items:
-  - etcd
-  - etcdctl
+    - etcd
+    - etcdctl
   when: etcd_cluster_setup