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/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