diff --git a/CHANGES.md b/CHANGES.md
index 07051076..42af7e13 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Notable changes between releases.
 
 * Upgrade Kubernetes v1.5.2 (static) example clusters
 * Upgrade Kubernetes v1.5.2 (self-hosted) example cluster
+* Use etcd3 by default in all clusters (remove etcd2 clusters)
 
 ## v0.5.0 (2017-01-23) 
 
diff --git a/examples/README.md b/examples/README.md
index e5cfa6ab..57591476 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -8,8 +8,6 @@ These examples network boot and provision machines into CoreOS clusters using `m
 | simple | CoreOS with autologin, using iPXE | stable/1235.9.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) |
 | simple-install | CoreOS Install, using iPXE | stable/1235.9.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) |
 | grub | CoreOS via GRUB2 Netboot | stable/1235.9.0 | RAM | NA |
-| etcd | A 3 node etcd cluster with proxies | stable/1235.9.0 | RAM | [reference](https://coreos.com/os/docs/latest/cluster-architectures.html) |
-| etcd-install | Install a 3 node etcd cluster to disk | stable/1235.9.0 | Disk | [reference](https://coreos.com/os/docs/latest/installing-to-disk.html) |
 | etcd3 | A 3 node etcd3 cluster with proxies | stable/1235.9.0 | RAM | None |
 | etcd3-install | Install a 3 node etcd3 cluster to disk | stable/1235.9.0 | Disk | None |
 | k8s | Kubernetes cluster with 1 master, 2 workers, and TLS-authentication | stable/1235.9.0 | Disk | [tutorial](../Documentation/kubernetes.md) |
diff --git a/examples/groups/etcd-aws/default.json b/examples/groups/etcd-aws/default.json
deleted file mode 100644
index 4a1d60bb..00000000
--- a/examples/groups/etcd-aws/default.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"id": "etcd-aws",
-	"name": "etcd Node",
-	"profile": "etcd-aws",
-	"selector": {
-		"name": "etcd",
-		"platform": "aws"
-	},
-	"metadata": {
-		"etcd_discovery": "token from https://discovery.etcd.io/new?size=N",
-		"ssh_authorized_keys": [
-			"ssh-rsa pub-key-goes-here"
-		]
-	}
-}
\ No newline at end of file
diff --git a/examples/groups/etcd-install/install.json b/examples/groups/etcd-install/install.json
deleted file mode 100644
index 05a7c32d..00000000
--- a/examples/groups/etcd-install/install.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": "coreos-install",
-  "name": "CoreOS Install",
-  "profile": "install-reboot",
-  "metadata": {
-    "coreos_channel": "stable",
-    "coreos_version": "1235.9.0",
-    "ignition_endpoint": "http://matchbox.foo:8080/ignition",
-    "baseurl": "http://matchbox.foo:8080/assets/coreos"
-  }
-}
diff --git a/examples/groups/etcd-install/node1.json b/examples/groups/etcd-install/node1.json
deleted file mode 100644
index 358c6a52..00000000
--- a/examples/groups/etcd-install/node1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "node1",
-  "name": "etcd Node 1",
-  "profile": "etcd",
-  "selector": {
-    "mac": "52:54:00:a1:9c:ae",
-    "os": "installed"
-  },
-  "metadata": {
-    "domain_name": "node1.example.com",
-    "etcd_name": "node1",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd-install/node2.json b/examples/groups/etcd-install/node2.json
deleted file mode 100644
index 6639a486..00000000
--- a/examples/groups/etcd-install/node2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "node2",
-  "name": "etcd Node 2",
-  "profile": "etcd",
-  "selector": {
-    "mac": "52:54:00:b2:2f:86",
-    "os": "installed"
-  },
-  "metadata": {
-    "domain_name": "node2.example.com",
-    "etcd_name": "node2",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd-install/node3.json b/examples/groups/etcd-install/node3.json
deleted file mode 100644
index 5a7bb99b..00000000
--- a/examples/groups/etcd-install/node3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "node3",
-  "name": "etcd Node 3",
-  "profile": "etcd",
-  "selector": {
-    "mac": "52:54:00:c3:61:77",
-    "os": "installed"
-  },
-  "metadata": {
-    "domain_name": "node3.example.com",
-    "etcd_name": "node3",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd-install/proxy.json b/examples/groups/etcd-install/proxy.json
deleted file mode 100644
index 285e50f8..00000000
--- a/examples/groups/etcd-install/proxy.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "etcd-proxies",
-  "name": "etcd Proxy",
-  "profile": "etcd-proxy",
-  "selector": {
-    "os": "installed"
-  },
-  "metadata": {
-    "fleet_metadata": "role=etcd-proxy",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd/node1.json b/examples/groups/etcd/node1.json
deleted file mode 100644
index 7c5cb595..00000000
--- a/examples/groups/etcd/node1.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "node1",
-  "name": "etcd Node 1",
-  "profile": "etcd",
-  "selector": {
-    "mac": "52:54:00:a1:9c:ae"
-  },
-  "metadata": {
-    "domain_name": "node1.example.com",
-    "etcd_name": "node1",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd/node2.json b/examples/groups/etcd/node2.json
deleted file mode 100644
index 4d8f5b09..00000000
--- a/examples/groups/etcd/node2.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "node2",
-  "name": "etcd Node 2",
-  "profile": "etcd",
-  "selector": {
-    "mac": "52:54:00:b2:2f:86"
-  },
-  "metadata": {
-    "domain_name": "node2.example.com",
-    "etcd_name": "node2",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd/node3.json b/examples/groups/etcd/node3.json
deleted file mode 100644
index 15e5eeb5..00000000
--- a/examples/groups/etcd/node3.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "node3",
-  "name": "etcd Node 3",
-  "profile": "etcd",
-  "selector": {
-    "mac": "52:54:00:c3:61:77"
-  },
-  "metadata": {
-    "domain_name": "node3.example.com",
-    "etcd_name": "node3",
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/groups/etcd/proxy.json b/examples/groups/etcd/proxy.json
deleted file mode 100644
index 11199040..00000000
--- a/examples/groups/etcd/proxy.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "id": "default",
-  "name": "default",
-  "profile": "etcd-proxy",
-  "metadata": {
-    "etcd_initial_cluster": "node1=http://node1.example.com:2380,node2=http://node2.example.com:2380,node3=http://node3.example.com:2380"
-  }
-}
diff --git a/examples/ignition/etcd-aws.yaml b/examples/ignition/etcd-aws.yaml
deleted file mode 100644
index 05117912..00000000
--- a/examples/ignition/etcd-aws.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-systemd:
-  units:
-    - name: etcd2.service
-      enable: true
-      dropins:
-        - name: metadata.conf
-          contents: |
-            [Unit]
-            Requires=coreos-metadata.service
-            After=coreos-metadata.service
-            [Service]
-            EnvironmentFile=/run/metadata/coreos
-            ExecStart=
-            ExecStart=/usr/bin/etcd2 \
-              --advertise-client-urls=http://${COREOS_EC2_IPV4_LOCAL}:2379 \
-              --initial-advertise-peer-urls=http://${COREOS_EC2_IPV4_LOCAL}:2380 \
-              --listen-client-urls=http://0.0.0.0:2379 \
-              --listen-peer-urls=http://${COREOS_EC2_IPV4_LOCAL}:2380 \
-              --discovery={{.etcd_discovery}}
-    - name: fleet.service
-      enable: true
-{{ if index . "ssh_authorized_keys" }}
-passwd:
-  users:
-    - name: core
-      ssh_authorized_keys:
-        {{ range $element := .ssh_authorized_keys }}
-        - {{$element}}
-        {{end}}
-{{end}}
\ No newline at end of file
diff --git a/examples/ignition/etcd-proxy.yaml b/examples/ignition/etcd-proxy.yaml
deleted file mode 100644
index 7d7e06a8..00000000
--- a/examples/ignition/etcd-proxy.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-systemd:
-  units:
-    - name: etcd2.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}}"
-    - name: locksmithd.service
-      dropins:
-        - name: 40-etcd-lock.conf
-          contents: |
-            [Service]
-            Environment="REBOOT_STRATEGY=etcd-lock"
-
-{{ if index . "ssh_authorized_keys" }}
-passwd:
-  users:
-    - name: core
-      ssh_authorized_keys:
-        {{ range $element := .ssh_authorized_keys }}
-        - {{$element}}
-        {{end}}
-{{end}}
diff --git a/examples/ignition/etcd.yaml b/examples/ignition/etcd.yaml
deleted file mode 100644
index f8645db7..00000000
--- a/examples/ignition/etcd.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-systemd:
-  units:
-    - name: etcd2.service
-      enable: true
-      dropins:
-        - name: 40-etcd-cluster.conf
-          contents: |
-            [Service]
-            Environment="ETCD_NAME={{.etcd_name}}"
-            Environment="ETCD_ADVERTISE_CLIENT_URLS=http://{{.domain_name}}:2379"
-            Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=http://{{.domain_name}}:2380"
-            Environment="ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379"
-            Environment="ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380"
-            Environment="ETCD_INITIAL_CLUSTER={{.etcd_initial_cluster}}"
-            Environment="ETCD_STRICT_RECONFIG_CHECK=true"
-    - name: locksmithd.service
-      dropins:
-        - name: 40-etcd-lock.conf
-          contents: |
-            [Service]
-            Environment="REBOOT_STRATEGY=etcd-lock"
-
-{{ if index . "ssh_authorized_keys" }}
-passwd:
-  users:
-    - name: core
-      ssh_authorized_keys:
-        {{ range $element := .ssh_authorized_keys }}
-        - {{$element}}
-        {{end}}
-{{end}}
diff --git a/examples/profiles/etcd-aws.json b/examples/profiles/etcd-aws.json
deleted file mode 100644
index a1355f6c..00000000
--- a/examples/profiles/etcd-aws.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "etcd",
-  "name": "etcd on AWS",
-  "ignition_id": "etcd-aws.yaml"
-}
\ No newline at end of file
diff --git a/examples/profiles/etcd-proxy.json b/examples/profiles/etcd-proxy.json
deleted file mode 100644
index 7d0df918..00000000
--- a/examples/profiles/etcd-proxy.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "etcd-proxy",
-  "name": "etcd-proxy",
-  "boot": {
-    "kernel": "/assets/coreos/1235.9.0/coreos_production_pxe.vmlinuz",
-    "initrd": ["/assets/coreos/1235.9.0/coreos_production_pxe_image.cpio.gz"],
-    "args": [
-      "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}",
-      "coreos.first_boot=yes",
-      "console=tty0",
-      "console=ttyS0",
-      "coreos.autologin"
-    ]
-  },
-  "ignition_id": "etcd-proxy.yaml"
-}
\ No newline at end of file
diff --git a/examples/profiles/etcd.json b/examples/profiles/etcd.json
deleted file mode 100644
index 2510d442..00000000
--- a/examples/profiles/etcd.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "etcd",
-  "name": "etcd",
-  "boot": {
-    "kernel": "/assets/coreos/1235.9.0/coreos_production_pxe.vmlinuz",
-    "initrd": ["/assets/coreos/1235.9.0/coreos_production_pxe_image.cpio.gz"],
-    "args": [
-      "coreos.config.url=http://matchbox.foo:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}",
-      "coreos.first_boot=yes",
-      "console=tty0",
-      "console=ttyS0",
-      "coreos.autologin"
-    ]
-  },
-  "ignition_id": "etcd.yaml"
-}
\ No newline at end of file