diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index 8e8c0f78..b569335e 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -55,7 +55,7 @@ data:
     kubernetes:
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
-      etcd: quay.io/coreos/etcd:v3.2.18
+      etcd: quay.io/coreos/etcd:v3.3.12
       scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
   files:
     - path: /var/lib/anchor/calico-etcd-bootstrap
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 09553c72..62b35979 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -364,8 +364,8 @@ data:
       filename: calico-etcd-bootstrap
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
@@ -1051,8 +1051,8 @@ data:
       host_etc_path: /etc/etcd/kubernetes
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index 8d22a879..25c37cf5 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -41,7 +41,7 @@ data:
     kubernetes:
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
-      etcd: quay.io/coreos/etcd:v3.2.18
+      etcd: quay.io/coreos/etcd:v3.3.12
       scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
   files:
     - path: /var/lib/anchor/calico-etcd-bootstrap
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 4e876193..3d4e4ca7 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -401,8 +401,8 @@ data:
       filename: calico-etcd-bootstrap
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
@@ -1077,8 +1077,8 @@ data:
       host_etc_path: /etc/etcd/kubernetes
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml
index 1855992b..5f433dfa 100644
--- a/examples/gate/Genesis.yaml
+++ b/examples/gate/Genesis.yaml
@@ -55,7 +55,7 @@ data:
     kubernetes:
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
-      etcd: quay.io/coreos/etcd:v3.2.18
+      etcd: quay.io/coreos/etcd:v3.3.12
       scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
   files:
     - path: /var/lib/anchor/calico-etcd-bootstrap
diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml
index 75e03110..9164ece7 100644
--- a/examples/gate/armada-resources.yaml
+++ b/examples/gate/armada-resources.yaml
@@ -277,8 +277,8 @@ data:
       filename: calico-etcd-bootstrap
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
@@ -856,8 +856,8 @@ data:
       host_etc_path: /etc/etcd/kubernetes
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py
index 21431563..b20856d3 100644
--- a/tests/unit/api/test_validatedesign.py
+++ b/tests/unit/api/test_validatedesign.py
@@ -111,7 +111,7 @@ VALID_DOCS = [
                     'controller-manager':
                     'gcr.io/google_containers/hyperkube-amd64:v1.11.6',
                     'etcd':
-                    'quay.io/coreos/etcd:v3.2.18',
+                    'quay.io/coreos/etcd:v3.3.12',
                     'scheduler':
                     'gcr.io/google_containers/hyperkube-amd64:v1.11.6'
                 }
diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml
index a1bf0d82..bfa98124 100644
--- a/tests/unit/builder_data/simple/Genesis.yaml
+++ b/tests/unit/builder_data/simple/Genesis.yaml
@@ -38,7 +38,7 @@ data:
     kubernetes:
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6
-      etcd: quay.io/coreos/etcd:v3.2.18
+      etcd: quay.io/coreos/etcd:v3.3.12
       scheduler: gcr.io/google_containers/hyperkube-amd64:v1.11.6
   files:
     - path: /var/lib/anchor/calico-etcd-bootstrap
diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml
index 4b534179..6f4e9a98 100644
--- a/tests/unit/builder_data/simple/armada-resources.yaml
+++ b/tests/unit/builder_data/simple/armada-resources.yaml
@@ -304,8 +304,8 @@ data:
       filename: calico-etcd-bootstrap
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
@@ -918,8 +918,8 @@ data:
       host_etc_path: /etc/etcd/kubernetes
     images:
       tags:
-        etcd: quay.io/coreos/etcd:v3.2.18
-        etcdctl: quay.io/coreos/etcd:v3.2.18
+        etcd: quay.io/coreos/etcd:v3.3.12
+        etcdctl: quay.io/coreos/etcd:v3.3.12
     nodes:
       - name: n0
         tls:
diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env
index a96a6b8b..dbf06841 100644
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@@ -5,7 +5,7 @@ IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2
 IMAGE_CALICO_NODE=quay.io/calico/node:v2.6.5
 IMAGE_COREDNS=coredns/coredns:1.1.3
 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-IMAGE_ETCD=quay.io/coreos/etcd:v3.2.18
+IMAGE_ETCD=quay.io/coreos/etcd:v3.3.12
 IMAGE_HAPROXY=haproxy:1.8.3
 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0
 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6