diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r196.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r198.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r196.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r198.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index 51f7bbca12..53ef1a083d 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -152,6 +152,7 @@ RDEPEND="${RDEPEND}
 	sys-process/criu
 	app-misc/ca-certificates
 	virtual/udev
+	coreos-base/oem-service
 	"
 
 # TODO(dianders):
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r150.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r151.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r150.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r151.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
index 2213ba44ea..b8b6f9f0a7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
@@ -105,6 +105,7 @@ RDEPEND="${RDEPEND}
 	dev-libs/protobuf-c
 	app-text/asciidoc
 	app-text/xmlto
+	sys-apps/gptfdisk
 	"
 
 # Host dependencies that create usernames/groups we need to pull over to target.
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh
new file mode 100755
index 0000000000..c42b30ad53
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/install-ec2-key.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+USER_DIR="/home/core/user"
+
+if [ ! -d ${USER_DIR}/.ssh ] ; then
+	mkdir -p ${USER_DIR}/.ssh
+	chmod 700 ${USER_DIR}/.ssh
+fi
+# Fetch public key using HTTP
+curl -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/my-key
+if [ $? -eq 0 ] ; then
+	cat /tmp/my-key >> ${USER_DIR}/.ssh/authorized_keys
+	chmod 700 ${USER_DIR}/.ssh/authorized_keys
+	rm /tmp/my-key
+fi
+chown -R core: $USER_DIR/.ssh
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/oem.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/oem.service
new file mode 100644
index 0000000000..e241aa4477
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/oem.service
@@ -0,0 +1,3 @@
+[service]
+Type=oneshot
+ExecStart=/usr/share/oem/bin/install-ec2-key.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/run.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/run.sh
new file mode 100755
index 0000000000..69c0f1858a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/share/oem/usr/bin/install-ec2-key.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild
new file mode 120000
index 0000000000..b1843e3373
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r4.ebuild
@@ -0,0 +1 @@
+oem-ami-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild
new file mode 100644
index 0000000000..755299ea13
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:$
+#
+
+EAPI=2
+
+DESCRIPTION="oem suite for ami images"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_install() {
+	dobin "${FILESDIR}"/install-ec2-key.sh
+
+	exeinto "/"
+	doexe ${FILESDIR}/run.sh
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service
new file mode 100644
index 0000000000..5df18d6e2d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/oem-service.service
@@ -0,0 +1,6 @@
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/run-oem.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh
new file mode 100755
index 0000000000..761a1a91ac
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/files/run-oem.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Each oem implemenation has a run.sh that boostraps its OEM process for systemd
+OEM_EXEC="/usr/share/oem/run.sh"
+
+[ -e $OEM_EXEC ] && exec $OEM_EXEC || exit 0
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r3.ebuild
new file mode 120000
index 0000000000..0b9310bc68
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1-r3.ebuild
@@ -0,0 +1 @@
+oem-service-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild
new file mode 100644
index 0000000000..5679292d10
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-service/oem-service-0.0.1.ebuild
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:$
+#
+
+EAPI=2
+inherit systemd
+
+DESCRIPTION="oem service"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_install() {
+	dobin ${FILESDIR}/run-oem.sh
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_enable_service multi-user.target ${PN}.service
+}