diff --git a/Documentation/bootkube.md b/Documentation/bootkube.md
index b4dff1bb..05fe79cc 100644
--- a/Documentation/bootkube.md
+++ b/Documentation/bootkube.md
@@ -12,12 +12,12 @@ Ensure that you've gone through the [matchbox with rkt](getting-started-rkt.md)
 * Create the example libvirt client VMs
 * `/etc/hosts` entries for `node[1-3].example.com` (or pass custom names to `k8s-certgen`)
 
-Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases/tag/v0.3.5) v0.3.5 and add it somewhere on your PATH.
+Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.3.7 and add it somewhere on your PATH.
 
-    $ wget https://github.com/kubernetes-incubator/bootkube/releases/download/v0.3.5/bootkube.tar.gz
+    $ wget https://github.com/kubernetes-incubator/bootkube/releases/download/v0.3.7/bootkube.tar.gz
     $ tar xzf bootkube.tar.gz
     $ ./bin/linux/bootkube version
-    Version: v0.3.5
+    Version: v0.3.7
 
 ## Examples
 
diff --git a/examples/groups/bootkube-install/node2.json b/examples/groups/bootkube-install/node2.json
index 9a4a84d4..1b2581d1 100644
--- a/examples/groups/bootkube-install/node2.json
+++ b/examples/groups/bootkube-install/node2.json
@@ -8,7 +8,7 @@
   },
   "metadata": {
     "domain_name": "node2.example.com",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380",
+    "etcd_endpoints": "node1.example.com:2379",
     "k8s_dns_service_ip": "10.3.0.10",
     "ssh_authorized_keys": [
       "ADD ME"
diff --git a/examples/groups/bootkube-install/node3.json b/examples/groups/bootkube-install/node3.json
index 282bfbd1..4e03758d 100644
--- a/examples/groups/bootkube-install/node3.json
+++ b/examples/groups/bootkube-install/node3.json
@@ -8,7 +8,7 @@
   },
   "metadata": {
     "domain_name": "node3.example.com",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380",
+    "etcd_endpoints": "node1.example.com:2379",
     "k8s_dns_service_ip": "10.3.0.10",
     "ssh_authorized_keys": [
       "ADD ME"
diff --git a/examples/groups/bootkube/node2.json b/examples/groups/bootkube/node2.json
index b2530028..c1979f71 100644
--- a/examples/groups/bootkube/node2.json
+++ b/examples/groups/bootkube/node2.json
@@ -7,7 +7,7 @@
   },
   "metadata": {
     "domain_name": "node2.example.com",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380",
+    "etcd_endpoints": "node1.example.com:2379",
     "k8s_dns_service_ip": "10.3.0.10",
     "pxe": "true",
     "ssh_authorized_keys": [
diff --git a/examples/groups/bootkube/node3.json b/examples/groups/bootkube/node3.json
index a8c17351..39db72bc 100644
--- a/examples/groups/bootkube/node3.json
+++ b/examples/groups/bootkube/node3.json
@@ -7,7 +7,7 @@
   },
   "metadata": {
     "domain_name": "node3.example.com",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380",
+    "etcd_endpoints": "node1.example.com:2379",
     "k8s_dns_service_ip": "10.3.0.10",
     "pxe": "true",
     "ssh_authorized_keys": [
diff --git a/examples/ignition/bootkube-controller.yaml b/examples/ignition/bootkube-controller.yaml
index f454bba5..8b4fe777 100644
--- a/examples/ignition/bootkube-controller.yaml
+++ b/examples/ignition/bootkube-controller.yaml
@@ -1,12 +1,13 @@
 ---
 systemd:
   units:
-    - name: etcd2.service
+    - name: etcd-member.service
       enable: true
       dropins:
         - name: 40-etcd-cluster.conf
           contents: |
             [Service]
+            Environment="ETCD_IMAGE_TAG=v3.1.0"
             Environment="ETCD_NAME={{.etcd_name}}"
             Environment="ETCD_ADVERTISE_CLIENT_URLS=http://{{.domain_name}}:2379"
             Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=http://{{.domain_name}}:2380"
@@ -113,7 +114,7 @@ storage:
       contents:
         inline: |
           KUBELET_ACI=quay.io/coreos/hyperkube
-          KUBELET_VERSION=v1.5.2_coreos.0
+          KUBELET_VERSION=v1.5.2_coreos.2
     - path: /etc/hostname
       filesystem: root
       mode: 0644
@@ -138,7 +139,7 @@ storage:
           # Wrapper for bootkube start
           set -e
           BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
-          BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.3.5}"
+          BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.3.7}"
           BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
           exec /usr/bin/rkt run \
             --trust-keys-from-https \
diff --git a/examples/ignition/bootkube-worker.yaml b/examples/ignition/bootkube-worker.yaml
index 926abff9..b119c0c0 100644
--- a/examples/ignition/bootkube-worker.yaml
+++ b/examples/ignition/bootkube-worker.yaml
@@ -1,15 +1,17 @@
 ---
 systemd:
   units:
-    - name: etcd2.service
+    - name: etcd-member.service
       enable: true
       dropins:
         - name: 40-etcd-cluster.conf
           contents: |
             [Service]
-            Environment="ETCD_PROXY=on"
-            Environment="ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379"
-            Environment="ETCD_INITIAL_CLUSTER={{.etcd_initial_cluster}}"
+            Environment="ETCD_IMAGE_TAG=v3.1.0"
+            ExecStart=
+            ExecStart=/usr/lib/coreos/etcd-wrapper gateway start \
+              --listen-addr=127.0.0.1:2379 \
+              --endpoints={{.etcd_endpoints}}
     - name: docker.service
       enable: true
     - name: locksmithd.service
@@ -101,7 +103,7 @@ storage:
       contents:
         inline: |
           KUBELET_ACI=quay.io/coreos/hyperkube
-          KUBELET_VERSION=v1.5.2_coreos.0
+          KUBELET_VERSION=v1.5.2_coreos.2
     - path: /etc/hostname
       filesystem: root
       mode: 0644