diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-auth-config/files/chromeos-auth b/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-auth-config/files/chromeos-auth
index b07fe86473..43f14769b4 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-auth-config/files/chromeos-auth
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-auth-config/files/chromeos-auth
@@ -4,11 +4,11 @@ auth [success=ignore default=3] pam_exec.so \
 
 # Check if a custom devmode password file exists and prefer it.
 auth [success=ignore default=1] pam_exec.so \
-  quiet /usr/bin/test -f /mnt/stateful_partition/etc/devmode.passwd
+  quiet /usr/bin/test -f /media/state/etc/devmode.passwd
 
 # If we get to pwdfile, use it or bypass the password-less login.
 auth [success=done default=1] pam_pwdfile.so \
-  pwdfile /mnt/stateful_partition/etc/devmode.passwd
+  pwdfile /media/state/etc/devmode.passwd
 
 # If we get here, allow password-less access
 auth sufficient pam_exec.so quiet /usr/bin/crossystem cros_debug?1
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
index 3b5c69231c..7819f209f7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
@@ -284,7 +284,7 @@ pkg_postinst() {
 	# Some default directories. These are created here rather than at
 	# install because some of them may already exist and have mounts.
 	for x in /dev /home /media \
-		/mnt/stateful_partition /proc /root /sys /var/lock; do
+		/proc /root /sys /var/lock; do
 		[ -d "${ROOT}/$x" ] && continue
 		install -d --mode=0755 --owner=root --group=root "${ROOT}/$x"
 	done
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 3cd1b954ad..611cc898c4 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
@@ -7,7 +7,7 @@ MY_IP=$(curl -s $META_URL/meta-data/local-ipv4)
 BOOTSTRAP="/var/run/etcd/bootstrap.config"
 
 # for etcd
-STATE=/mnt/stateful_partition/etcd
+STATE=/media/state/etcd
 mkdir -p $STATE
 
 [ ! -e $BOOTSTRAP ] && echo bootstrap config missing && exit 1