diff --git a/README.md b/README.md
index 31afbe8ea..cfc82a6cd 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Versions of supported components
--------------------------------
[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.5.1
-[etcd](https://github.com/coreos/etcd/releases) v3.0.6
+[etcd](https://github.com/coreos/etcd/releases) v3.0.17
[flanneld](https://github.com/coreos/flannel/releases) v0.6.2
[calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.23.0
[canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index a0c0b8ded..e64845460 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -19,7 +19,7 @@ download_always_pull: False
# Versions
kube_version: v1.6.1
-etcd_version: v3.0.6
+etcd_version: v3.0.17
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
calico_version: "v1.1.0-rc8"
diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml
index 2a23087a4..92b8c9315 100644
--- a/roles/uploads/defaults/main.yml
+++ b/roles/uploads/defaults/main.yml
@@ -2,7 +2,7 @@
local_release_dir: /tmp
# Versions
-etcd_version: v3.0.6
+etcd_version: v3.0.17
calico_version: v0.23.0
calico_cni_version: v1.5.6
weave_version: v1.8.2