diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r6.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r6.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
index 22ffc010a1..935164ef8d 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright (c) 2017 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 CROS_WORKON_PROJECT="flatcar-linux/update-ssh-keys"
 CROS_WORKON_LOCALNAME="update-ssh-keys"
@@ -14,17 +14,6 @@ else
 	KEYWORDS="amd64 arm64"
 fi
 
-inherit coreos-cargo cros-workon
-
-DESCRIPTION="Utility for managing OpenSSH authorized public keys"
-HOMEPAGE="https://github.com/flatcar-linux/update-ssh-keys"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# make sure we have a new enough coreos-init that we won't conflict with the
-# old bash script
-RDEPEND="!<coreos-base/coreos-init-0.0.1-r152"
-
 # sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock
 CRATES="
 ansi_term-0.11.0
@@ -60,8 +49,19 @@ winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
 "
 
+inherit coreos-cargo cros-workon
+
+DESCRIPTION="Utility for managing OpenSSH authorized public keys"
+HOMEPAGE="https://github.com/flatcar-linux/update-ssh-keys"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# make sure we have a new enough coreos-init that we won't conflict with the
+# old bash script
+RDEPEND="!<coreos-base/coreos-init-0.0.1-r152"
+
 src_unpack() {
 	cros-workon_src_unpack "$@"
 	coreos-cargo_src_unpack "$@"