diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/gentoo-run.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/gentoo-run.conf
deleted file mode 100644
index 5b3bcab8f3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/gentoo-run.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# New OpenRC versions replace /var/lock with a symlink to /run/lock.
-# We just create that directory for now, just in case.
-# Of course, it's not guaranteed that'll satisfy all relevant packages.
-
-d /run/lock 0755 root root -
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf
new file mode 100644
index 0000000000..07cc22308f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf
@@ -0,0 +1,9 @@
+d   /etc/binfmt.d           -   -   -   -   -
+d   /etc/modules-load.d     -   -   -   -   -
+d   /etc/sysctl.d           -   -   -   -   -
+d   /etc/systemd            -   -   -   -   -
+d   /etc/systemd/network    -   -   -   -   -
+d   /etc/systemd/system     -   -   -   -   -
+d   /etc/systemd/user       -   -   -   -   -
+d   /etc/tmpfiles.d         -   -   -   -   -
+d   /var/lib/systemd        -   -   -   -   -
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-lock.mount b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-lock.mount
deleted file mode 100644
index 07277adac3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-lock.mount
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Lock Directory
-Before=local-fs.target
-# skip mounting if the directory does not exist or is a symlink
-ConditionPathIsDirectory=/var/lock
-ConditionPathIsSymbolicLink=!/var/lock
-
-[Mount]
-What=/run/lock
-Where=/var/lock
-Type=bind
-Options=bind
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-run.mount b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-run.mount
deleted file mode 100644
index ab4da424c9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-run.mount
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Runtime Directory
-Before=local-fs.target
-# skip mounting if the directory does not exist or is a symlink
-ConditionPathIsDirectory=/var/run
-ConditionPathIsSymbolicLink=!/var/run
-
-[Mount]
-What=/run
-Where=/var/run
-Type=bind
-Options=bind
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r2.ebuild
similarity index 98%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r2.ebuild
index 31a58818c2..c2869ba324 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r2.ebuild
@@ -350,11 +350,7 @@ multilib_src_install_all() {
 	# Disable storing coredumps in journald, bug #433457
 	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
 
-	# Preserve empty dir /var, bug #437008
-	keepdir /var/lib/systemd
-
-	# Keep /etc clean
-	rmdir "${D}"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d || die
+	systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
 
 	# Don't default to graphical.target
 	rm "${D}"/usr/lib/systemd/system/default.target || die