diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service
index 84acbcd739..82d2bcc979 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=fleet
+Wants=etcd.service
 
 [Service]
 ExecStart=/usr/bin/fleet
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.1.4-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r9.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r9.ebuild
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 2148f7956d..104c89ea1e 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
@@ -8,3 +8,6 @@ Environment=ETCD_DATA_DIR=/var/lib/etcd ETCD_NAME=default
 ExecStart=/usr/bin/etcd 
 Restart=always
 RestartSec=10s
+
+[Install]
+WantedBy=multi-user.target