diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild
similarity index 90%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild
index f1bdce4337..63e60df2cf 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild
@@ -9,7 +9,7 @@ EAPI=4
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="e77b9aa020a2041a0f88459a4d82f236517dff09" # hash for tag v0.1.2
+CROS_WORKON_COMMIT="5271378fc2c76f9c368f8ef96623d156888fbffa" # hash for tag v0.2.0
 inherit toolchain-funcs cros-workon systemd
 
 DESCRIPTION="etcd"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
index 2b6e6c8622..2ac1fd41a9 100755
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
@@ -2,7 +2,7 @@
 
 VIRT=$(coreos-detect-virt)
 STATE=/var/lib/etcd
-DEFAULT_ARGS="-d $STATE -f -cl 0.0.0.0"
+DEFAULT_ARGS="-d $STATE -f -cl 0.0.0.0 -n ${HOSTNAME}"
 
 if [ "${VIRT}" != "ec2" ]; then
 	echo "Detected environment \"${VIRT}\", just starting solo master..."
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.2.ebuild
deleted file mode 100644
index 10b69885b0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2013 The CoreOS Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CROS_WORKON_PROJECT="coreos/etcdctl"
-CROS_WORKON_LOCALNAME="etcdctl"
-CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="5aaeca137f947459c1b4588c5643a68a80592e03" # v0.1.2 tag + version flag
-
-inherit cros-workon
-
-DESCRIPTION="etcd command line client"
-HOMEPAGE="https://github.com/coreos/etcdctl"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.1"
-RDEPEND=""
-
-src_compile() {
-	./build
-}
-
-src_install() {
-	dobin ${S}/${PN}
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild
similarity index 84%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild
index 47b49f0beb..4cca6ccafe 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 CROS_WORKON_PROJECT="coreos/etcdctl"
 CROS_WORKON_LOCALNAME="etcdctl"
 CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="689b26571ddc21bae9d94bec4eea231852362349" # v0.1.0 tag
+CROS_WORKON_COMMIT="ee096789193311aa6ea0717c8b31f4cf8c2dfe7d" # v0.2.0 tag + version flag
 
 inherit cros-workon