diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults
index f5f2956412..6e7daf2336 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults
@@ -140,7 +140,7 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE"
 
 # Extra use flags for Core OS SDK (and possibly targets)
 # Previously defined in make.conf
-USE="${USE} hardened cros_host pic pie expat -introspection -cups -openrc"
+USE="${USE} hardened cros_host pic pie expat -introspection -cups"
 
 # Enable bindist for both SDK and targets
 USE="${USE} bindist"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
index abc7e274ab..efcad30663 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
@@ -64,12 +64,6 @@
 =sys-devel/llvm-3.2 ~amd64
 =dev-python/pyusb-1.0.0_alpha3 ~amd64
 
-# Accept the unstable nature of systemd
-=sys-apps/systemd-197-r1 ~amd64
-=sys-apps/systemd-204 ~amd64
-=sys-apps/systemd-sysv-utils-194 ~amd64
-=sys-apps/dbus-1.6.8-r1 ~amd64
-
 # Get updated core code
 =sys-auth/pam_pwdfile-0.99-r1 ~amd64
 =net-misc/tlsdate-0.0.5 ~amd64
@@ -95,7 +89,6 @@
 # Everything needed for the boot engine
 >=sys-apps/kexec-tools-2.0.4-r1 ~amd64
 >=sys-kernel/dracut-027-r3 ~amd64
-=sys-apps/sysvinit-tools-2.88-r4 ~amd64
 
 # Needed for docker
 =sys-fs/aufs-util-3.7.6 ~amd64
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided
index 9cb0c2094b..7e87b34be8 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided
@@ -5,7 +5,3 @@
 # even a simple mta (like ssmtp).  http://crosbug.com/5777
 mail-mta/ssmtp-2.64
 net-mail/mailbase-1
-
-# Ideally baselayout should have a use flag to select between openrc
-# and systemd but this works in the mean time.
-sys-apps/openrc-9999
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask
deleted file mode 100644
index 38b2155e32..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask
+++ /dev/null
@@ -1 +0,0 @@
-=sys-apps/systemd-sysv-utils-194
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent
new file mode 100644
index 0000000000..a243617a91
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent
@@ -0,0 +1 @@
+../../features/systemd
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords
index cb364ffe02..04665bebc6 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords
@@ -64,10 +64,8 @@
 =sys-apps/i2c-tools-3.0.2       amd64 arm x86
 =sys-apps/keyutils-1.1  amd64 arm x86
 =sys-apps/net-tools-1.60_p20090728014017-r1   amd64 arm x86
-=sys-apps/openrc-0.4.3-r4	amd64 arm x86
 =sys-apps/rescan-scsi-bus-1.29  amd64 arm x86
 =sys-apps/sg3_utils-1.27.20090411	amd64 arm x86
-=sys-apps/sysvinit-2.86-r12	amd64 arm x86
 =sys-apps/usbutils-0.86-r1	amd64 arm x86
 =sys-apps/util-linux-2.16.1	amd64 arm x86
 =sys-auth/consolekit-0.3.0-r3	amd64 arm x86
@@ -79,7 +77,6 @@
 =sys-fs/avfs-1.0.0		amd64 arm x86
 =sys-fs/lvm2-2.02.73-r1                amd64 arm x86
 =sys-fs/squashfs-4.2            amd64 arm x86
-=sys-fs/udev-171-r2		amd64 arm x86
 =sys-block/btrace-1.0.0		amd64 arm x86
 =x11-libs/libdrm-2.4.24         amd64 arm x86
 =sys-libs/libhx-3.1		amd64 arm x86
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use
index b07becfbf6..c0d05cd4cd 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use
@@ -60,7 +60,6 @@ sys-auth/polkit         -introspection
 sys-block/parted        device-mapper
 sys-fs/lvm2		-lvm1 -readline -static -thin
 sys-fs/ntfs3g		-crypt -external-fuse ntfsprogs suid
-sys-fs/udev		-devfs-compat -rule_generator hwdb acl gudev
 sys-fs/squashfs         lzo
 sys-libs/gdbm		-berkdb
 sys-libs/ncurses	minimal