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 aad79792a8..e4620260be 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
@@ -11,3 +11,6 @@ After=fleet.socket
 ExecStart=/usr/bin/fleetd
 Restart=always
 RestartSec=10s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.10.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.10.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.10.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.10.2-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.1.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.1.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.1.1-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 acd6632f8d..a04479d22e 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
@@ -10,3 +10,6 @@ ExecStart=/usr/bin/etcd2
 Restart=always
 RestartSec=10s
 LimitNOFILE=40000
+
+[Install]
+WantedBy=multi-user.target