diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest
index c33b969113..dcb5879a3b 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest
@@ -1,3 +1,3 @@
 DIST pxe-444.5.0.img 114147963 SHA256 26aaee080c50e8ccb0aca81e22f7b64307e31ca0f5b4d8aa989a2381bb56879c SHA512 aad9983e90fc1c0924df505c91a2a9912cec8083fa3ec7b9b67d6de82daf4b420de638d7bde5f129770815d6fbac53913c6a80e254b3777981787730bafb4e08 WHIRLPOOL 1e373a8728a01bf6e53b2760d24187a19aec9d32f05f04de8557f6fec01f652d577781f447463188a50070aaf31f48b2c67317989d89d9c114920b0e0cd8edaf
 DIST rkt-pxe-709.0.0.img 148919232 SHA256 d0df52bee7134fdeb6bc4d973e7ff651979894c0895423e2e9a0dd35279e7c3b SHA512 dc2f70eb29ebfe32b66201fc7fe3a343eee66feb2ad5fa1635bb4a979252440e378d28496f567e8a7761942a9e42e1f846626626e81ec9be38f4980cd4a8db99 WHIRLPOOL 72960971ad2e97e13305b0c21496b306c43185aee94c369d2ce3aad522701926a9cb0fbbd250b789f4beadbda3f872ea1a007943545279c0d904c673cc32fd93
-DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
+DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/files/rkt-gc.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/files/rkt-gc.service
deleted file mode 100644
index eb3ebc1e9e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/files/rkt-gc.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Garbage Collection for rkt
-
-[Service]
-Environment=GRACE_PERIOD=24h
-Type=oneshot
-ExecStart=/usr/bin/rkt gc --grace-period=${GRACE_PERIOD}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/files/rkt-gc.timer b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/files/rkt-gc.timer
deleted file mode 100644
index fdcf5ed839..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/files/rkt-gc.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Periodic Garbage Collection for rkt
-
-[Timer]
-OnActiveSec=0s
-OnUnitActiveSec=12h
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.7.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.7.0-r1.ebuild
deleted file mode 120000
index e476440198..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.7.0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-rkt-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.7.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.7.0-r1.ebuild
new file mode 100644
index 0000000000..e9986edcbf
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.7.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+inherit cros-workon
+
+CROS_WORKON_PROJECT="coreos/rkt"
+CROS_WORKON_LOCALNAME="rkt"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS="~amd64"
+	PXE_VERSION="738.1.0"
+
+elif [[ "${PV}" == "0.7.0" ]]; then
+	KEYWORDS="amd64"
+	PXE_VERSION="709.0.0"
+	CROS_WORKON_COMMIT="9579f4bf57851a1a326c81ec2ab0ed2fdfab8d24"
+fi
+
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny
+	rkt_stage1_src? (
+		~sys-apps/systemd-222
+		app-shells/bash
+	)"
+RDEPEND="!app-emulation/rocket
+	actool? ( !app-emulation/actool )
+	rkt_stage1_host? (
+		~sys-apps/systemd-222
+		app-shells/bash
+	)"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-stage1-image-path="/usr/share/rkt/stage1.aci"
+	)
+
+	if use rkt_stage1_host; then
+		myeconfargs+=( --with-stage1="host" )
+	elif use rkt_stage1_src; then
+		myeconfargs+=( --with-stage1="src" )
+	elif use rkt_stage1_coreos; then
+		myeconfargs+=( --with-stage1="coreos" )
+		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+	dobin "${S}/${BUILDDIR}/bin/rkt"
+
+	insinto /usr/share/rkt/
+	doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+	systemd_dounit "${FILESDIR}"/${PN}-gc.service
+	systemd_dounit "${FILESDIR}"/${PN}-gc.timer
+	systemd_enable_service multi-user.target ${PN}-gc.timer
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+	systemd_enable_service sockets.target ${PN}-metadata.socket
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.8.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.8.1.ebuild
new file mode 120000
index 0000000000..e476440198
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.8.1.ebuild
@@ -0,0 +1 @@
+rkt-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild
index 331fbf5885..880700b9af 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild
@@ -14,16 +14,16 @@ CROS_WORKON_PROJECT="coreos/rkt"
 CROS_WORKON_LOCALNAME="rkt"
 CROS_WORKON_REPO="git://github.com"
 
+
 if [[ "${PV}" == "9999" ]]; then
 	KEYWORDS="~amd64"
-	PXE_VERSION="738.1.0"
-
-elif [[ "${PV}" == "0.7.0" ]]; then
+elif [[ "${PV}" == "0.8.1" ]]; then
 	KEYWORDS="amd64"
-	PXE_VERSION="709.0.0"
-	CROS_WORKON_COMMIT="9579f4bf57851a1a326c81ec2ab0ed2fdfab8d24"
+	CROS_WORKON_COMMIT="a4b17f07700afd4e24be0153ca4fc73c35e14c31"
 fi
 
+PXE_VERSION="794.1.0"
+PXE_SYSTEMD_VERSION="222"
 PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
 PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
 
@@ -35,7 +35,7 @@ HOMEPAGE="https://github.com/coreos/rkt"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
 REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
 
 DEPEND=">=dev-lang/go-1.4.1
@@ -43,13 +43,13 @@ DEPEND=">=dev-lang/go-1.4.1
 	sys-fs/squashfs-tools
 	dev-perl/Capture-Tiny
 	rkt_stage1_src? (
-		>=sys-apps/systemd-220
+		>=sys-apps/systemd-222
 		app-shells/bash
 	)"
 RDEPEND="!app-emulation/rocket
 	actool? ( !app-emulation/actool )
 	rkt_stage1_host? (
-		>=sys-apps/systemd-220
+		~sys-apps/systemd-222
 		app-shells/bash
 	)"
 
@@ -62,14 +62,12 @@ src_configure() {
 
 	if use rkt_stage1_host; then
 		myeconfargs+=( --with-stage1="host" )
-	fi
-	if use rkt_stage1_src; then
+	elif use rkt_stage1_src; then
 		myeconfargs+=( --with-stage1="src" )
-	fi
-	if use rkt_stage1_coreos; then
+	elif use rkt_stage1_coreos; then
 		myeconfargs+=( --with-stage1="coreos" )
-		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
-		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+		myeconfargs+=( --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" )
+		myeconfargs+=( --with-coreos-local-pxe-image-systemd-version=v"${PXE_SYSTEMD_VERSION}" )
 	fi
 
 	# Go's 6l linker does not support PIE, disable so cgo binaries