diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
index 2dc7a037d2..c28e43efc8 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
@@ -88,25 +88,48 @@ INSTALL_MASK="${INSTALL_MASK}
 "
 
 # Override UIDs and GIDs where ours differ from Gentoo defaults.
+ACCT_GROUP_DHCP_ID=224
+ACCT_USER_DHCP_ID=224
+
 ACCT_GROUP_DIALOUT_ID=249
+
 ACCT_GROUP_DOCKER_ID=233
+
+ACCT_GROUP_ETCD_ID=232
+ACCT_USER_ETCD_ID=232
+ACCT_USER_ETCD_HOME=/dev/null
+
 ACCT_GROUP_INPUT_ID=28
+
 ACCT_GROUP_MESSAGEBUS_ID=201
 ACCT_USER_MESSAGEBUS_ID=201
+
 ACCT_GROUP_NTP_ID=203
 ACCT_USER_NTP_ID=203
+
 ACCT_GROUP_POLKITD_ID=235
 ACCT_USER_POLKITD_ID=235
+
+ACCT_USER_PORTAGE_HOME=/var/tmp/portage
+
+ACCT_USER_ROOT_GROUPS_ADD="bin daemon sys adm disk wheel floppy tape video"
+
 ACCT_GROUP_RENDER_ID=30
+
 ACCT_GROUP_SSHD_ID=204
 ACCT_USER_SSHD_ID=204
+
 ACCT_GROUP_SYSTEMD_JOURNAL_ID=248
+
 ACCT_GROUP_SYSTEMD_JOURNAL_REMOTE_ID=242
 ACCT_USER_SYSTEMD_JOURNAL_REMOTE_ID=242
+
 ACCT_GROUP_SYSTEMD_NETWORK_ID=244
 ACCT_USER_SYSTEMD_NETWORK_ID=244
+
 ACCT_GROUP_SYSTEMD_RESOLVE_ID=245
 ACCT_USER_SYSTEMD_RESOLVE_ID=245
+
 # tss seems to be one of those users with a mismatching UID/GID
 ACCT_GROUP_TSS_ID=252
 ACCT_USER_TSS_ID=236