diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper
old mode 100755
new mode 100644
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0-r1.ebuild
similarity index 66%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0-r1.ebuild
index 31fe837498..089638114b 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0-r1.ebuild
@@ -1,27 +1,21 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit systemd
 
 DESCRIPTION="flannel (System Application Container)"
-HOMEPAGE="https://github.com/coreos/flannel"
-
-KEYWORDS="amd64 arm64"
-SRC_URI=""
-
+HOMEPAGE="https://github.com/flannel-io/flannel"
+S="${WORKDIR}"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
-	!app-admin/flannel
 	>=app-admin/sdnotify-proxy-0.1.0
 "
 
-S="$WORKDIR"
-
 src_install() {
 	local tag="v${PV}"
 	if [[ "${ARCH}" != "amd64" ]]; then
@@ -32,12 +26,12 @@ src_install() {
 	doexe "${FILESDIR}"/flannel-wrapper
 
 	sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
-		"${FILESDIR}"/flanneld.service > ${T}/flanneld.service
-	systemd_dounit ${T}/flanneld.service
+		"${FILESDIR}"/flanneld.service > "${T}"/flanneld.service
+	systemd_dounit "${T}"/flanneld.service
 
 	sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
-		"${FILESDIR}"/flannel-docker-opts.service > ${T}/flannel-docker-opts.service
-	systemd_dounit ${T}/flannel-docker-opts.service
+		"${FILESDIR}"/flannel-docker-opts.service > "${T}"/flannel-docker-opts.service
+	systemd_dounit "${T}"/flannel-docker-opts.service
 
 	insinto /usr/lib/systemd/network
 	doins "${FILESDIR}"/50-flannel.network
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/metadata.xml
index 097975e3ad..946ad15998 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-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">flannel-io/flannel</remote-id>
+	</upstream>
 </pkgmetadata>