diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.5.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.5.1-r5.ebuild
similarity index 98%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.5.1-r4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.5.1-r5.ebuild
index 69187c5d77..3fe3909301 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.5.1-r4.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.5.1-r5.ebuild
@@ -123,6 +123,9 @@ src_install() {
 		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
 		set_login_opt LOGIN_RETRIES 3
 		set_login_opt ENCRYPT_METHOD SHA512
+
+		# CoreOS: increase the minimum password length to eight
+		set_login_opt PASS_MIN_LEN 8
 	else
 		dopamd "${FILESDIR}"/pam.d-include/shadow