diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r2.ebuild
similarity index 77%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r2.ebuild
index 62e4fd6ecb..0bbcbdb7da 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r2.ebuild
@@ -1,25 +1,19 @@
 # Copyright (c) 2016 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-TMPFILES_OPTIONAL=1
 inherit systemd tmpfiles
 
 DESCRIPTION="etcd (System Application Container)"
 HOMEPAGE="https://github.com/etcd-io/etcd"
+S="${WORKDIR}"
+LICENSE="Apache-2.0"
+SLOT="0"
 KEYWORDS="amd64 arm64"
 
-LICENSE="Apache-2.0"
-IUSE=""
-SLOT=0
-
-DEPEND=""
-
 RDEPEND=">=app-admin/sdnotify-proxy-0.1.0"
 
-S=${WORKDIR}
-
 src_install() {
 	local tag="v${PV}"
 	if [[ "${ARCH}" != "amd64" ]]; then
@@ -30,7 +24,7 @@ src_install() {
 	doexe "${FILESDIR}"/etcd-wrapper
 
 	sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
-		"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
-	systemd_dounit ${T}/etcd-member.service
+		"${FILESDIR}"/etcd-member.service > "${T}"/etcd-member.service
+	systemd_dounit "${T}"/etcd-member.service
 	dotmpfiles "${FILESDIR}"/etcd-wrapper.conf
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper
old mode 100755
new mode 100644
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/metadata.xml
index 097975e3ad..eb360dbaae 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="github">etcd-io/etcd</remote-id>
+	</upstream>
 </pkgmetadata>