diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r3.ebuild
deleted file mode 120000
index d34d927072..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r3.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-coreos-au-key-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild
deleted file mode 100644
index 7e8086269b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2013 CoreOS Inc. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-# This key pair is only used in development. An official production image will
-# have the production keys inserted at build time. (see core_update_upload)
-
-DESCRIPTION="CoreOS development auto update keys."
-HOMEPAGE="http://github.com/coreos/"
-SRC_URI=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="cros_host"
-
-src_install() {
-	KEY_DIR=/usr/share/update_engine/
-	insinto "${KEY_DIR}"
-	doins "${FILESDIR}"/update-payload-key.pub.pem
-	if use cros_host; then
-		doins "${FILESDIR}"/update-payload-key.key.pem
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild
new file mode 100644
index 0000000000..b2e180793a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright (c) 2013 CoreOS Inc. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="CoreOS auto update signing keys."
+HOMEPAGE="http://github.com/coreos/"
+SRC_URI=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="cros_host official"
+
+# Do not enable offical and SDK at the same time,
+# the SDK only needs developer keys.
+REQUIRED_USE="?? ( cros_host official )"
+
+# No source to unpack
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/update_engine
+	if use official; then
+		newins "${FILESDIR}/official-v2.pub.pem" update-payload-key.pub.pem
+	else
+		newins "${FILESDIR}/developer-v1.key.pem" update-payload-key.key.pem
+		newins "${FILESDIR}/developer-v1.pub.pem" update-payload-key.pub.pem
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/update-payload-key.key.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/developer-v1.key.pem
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/update-payload-key.key.pem
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/developer-v1.key.pem
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/update-payload-key.pub.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/developer-v1.pub.pem
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/update-payload-key.pub.pem
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/developer-v1.pub.pem
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem
new file mode 100644
index 0000000000..10fcaff58b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7pO21yN+b6yx9P+wHzS2
+clxGs18eWxfoleETLbFVmcXu783rgBP0bFjYfqrNZNaI1Ip6bxEYkPacg0xFg7ri
+lNdO/cxJV5Ltj40wFlpmzJOAH8hx5SF8KWg2NV1I6TS8pp+CQqcvvOKu6AIcWfeY
+11V7eJ8rWcDsnqpTg8T1VRxytsg2UjTMfQwzcGLTb8cQ8AV39ED5WC5NdS9Bld4h
+XqS9Dx6Pe3JOQLZze6XIIwWuB2jxGpM1GWfRNm5nxvne3l7ggC970482a7STGK10
+fD8//k8myVxleMAeQoMRXoRq9p3C84H4Bw8v2dX13kFFCgfEQj6SOZ5huXZKLPpB
+LwIDAQAB
+-----END PUBLIC KEY-----