diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.2-r1.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 68508c80a3..288a0db973 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
@@ -11,6 +11,7 @@ ExecStart=/usr/bin/etcd2
 Restart=always
 RestartSec=10s
 LimitNOFILE=40000
+TimeoutStartSec=0
 
 [Install]
 WantedBy=multi-user.target