diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
index bd1acc36b1..acd6632f8d 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
@@ -5,6 +5,7 @@ Conflicts=etcd.service
 [Service]
 User=etcd
 Environment=ETCD_DATA_DIR=/var/lib/etcd2
+Environment=ETCD_NAME=%m
 ExecStart=/usr/bin/etcd2
 Restart=always
 RestartSec=10s