diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild
deleted file mode 120000
index a6e5e5dcc1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-etcd-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild
similarity index 88%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild
index 5257f11848..dc00babd30 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.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="fac8d662445b2c09e3f24c282c2b37754bc7357f"
+CROS_WORKON_COMMIT="7b289043c7beced434be4334fb909ba0b16b57b1" # hash for tag v0.1.1
 inherit toolchain-funcs cros-workon systemd
 
 DESCRIPTION="etcd"
@@ -23,8 +23,6 @@ IUSE=""
 
 DEPEND=">=dev-lang/go-1.1"
 
-ETCD_PACKAGE="github.com/coreos/etcd"
-
 src_compile() {
 	./build
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
index a09910ca91..9d6f87b8f2 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
@@ -22,8 +22,6 @@ IUSE=""
 
 DEPEND=">=dev-lang/go-1.1"
 
-ETCD_PACKAGE="github.com/coreos/etcd"
-
 src_compile() {
 	./build
 }
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 0909b6ae5a..74a54d1559 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,10 +2,11 @@
 
 VIRT=$(coreos-detect-virt)
 STATE=/var/lib/etcd
+DEFAULT_ARGS="-v -d $STATE -f"
 
 if [ "${VIRT}" != "ec2" ]; then
 	echo "Detected environment \"${VIRT}\", just starting solo master..."
-        exec /usr/bin/etcd -v -d $STATE
+        exec /usr/bin/etcd ${DEFAULT_ARGS}
 fi
 
 META_URL="http://169.254.169.254/latest"
@@ -20,9 +21,9 @@ IPS=$(grep -v $MY_IP $BOOTSTRAP|grep -v '^\n$' |sed 's/$/:7001/'|tr '\n' ','|sed
 
 if [ -z "$IPS" ]; then
         echo "becoming master..."
-        exec /usr/bin/etcd -v -h $MY_IP -d $STATE
+        exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP
 else
         echo "trying $IPS"
         set -x
-        exec /usr/bin/etcd -v -h $MY_IP -C "$IPS" -d $STATE
+        exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP -C "$IPS"
 fi
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
index 6a65b7eed1..52f96ef867 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
@@ -9,5 +9,10 @@ PermissionsStartOnly=true
 ExecStartPre=/usr/bin/etcd-pre-exec
 ExecStart=/usr/bin/etcd-bootstrap
 
+Restart=always
+# Set a longish timeout in case this machine isn't behaving
+# nicely and bothering the rest of the cluster
+RestartSec=10s
+
 [Install]
 WantedBy=multi-user.target