diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
index c688066e17..5257f11848 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild
@@ -34,9 +34,7 @@ src_install() {
 	dobin ${FILESDIR}/etcd-bootstrap
 	dobin ${FILESDIR}/etcd-pre-exec
 
-	keepdir /var/lib/${PN}
-	fowners etcd:etcd /var/lib/${PN}
-
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
index edbdd0b288..a09910ca91 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
@@ -33,9 +33,7 @@ src_install() {
 	dobin ${FILESDIR}/etcd-bootstrap
 	dobin ${FILESDIR}/etcd-pre-exec
 
-	keepdir /var/lib/${PN}
-	fowners etcd:etcd /var/lib/${PN}
-
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_enable_service multi-user.target ${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
index 49f0c1c276..0909b6ae5a 100755
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-STATE=/var/lib/etcd
-mkdir -p $STATE
-
 VIRT=$(coreos-detect-virt)
+STATE=/var/lib/etcd
 
 if [ "${VIRT}" != "ec2" ]; then
 	echo "Detected environment \"${VIRT}\", just starting solo master..."
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-pre-exec b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-pre-exec
index 2d5e51de39..0608211bfa 100755
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-pre-exec
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-pre-exec
@@ -9,6 +9,3 @@ if [ -d /media/state/etcd ]; then
   rm -R ${OLD_STATE}
   chown -R etcd:etcd ${STATE}
 fi
-
-mkdir -p /var/run/etcd
-chown etcd:etcd /var/run/etcd
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
new file mode 100644
index 0000000000..721e9c9161
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
@@ -0,0 +1,2 @@
+d    /var/lib/etcd 0755 etcd etcd - -
+d    /var/run/etcd 0755 etcd etcd - -