diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
index d3a386b6c5..e59fbee9c1 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
@@ -89,3 +89,10 @@ net-fs/nfs-utils ~arm64
 =net-wireless/wireless-tools-30_pre9 ~arm64
 =net-wireless/iw-4.0 **
 =net-libs/libmicrohttpd-0.9.44 **
+
++# required by sys-block/open-iscsi-2.0.873-r1::coreos
++# required by coreos-base/coreos-0.0.1-r266::coreos
++# required by coreos-base/coreos-dev-0.1.0-r75::coreos
++# required by coreos-devel/board-packages-0.0.1-r4::coreos
++# required by coreos-devel/board-packages (argument)
++=sys-fs/lsscsi-0.28 **
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service
new file mode 100644
index 0000000000..41c04ca1d6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service
@@ -0,0 +1,10 @@
+# Generate an iSCSI initiator name if one doesn't already exist
+[Unit]
+Description=iSCSI initiator name generator
+After=systemd-tmpfiles-setup.service
+ConditionPathExists=!/etc/iscsi/initiatorname.iscsi
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'echo InitiatorName=iqn.2016-04.com.coreos.iscsi:$(</etc/machine-id) >/etc/iscsi/initiatorname.iscsi'
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service
index 4846340cf0..322d37eee5 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service
+++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Open-iSCSI
 Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
-After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service
+After=network.target NetworkManager-wait-online.service iscsid-initiatorname.service iscsiuio.service tgtd.service targetcli.service
+Requires=iscsid-initiatorname.service
 
 [Service]
 Type=forking
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
similarity index 96%
rename from sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
index 7337afa88d..2d388d0998 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -89,8 +89,10 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/iscsid.service
 	systemd_dounit "${FILESDIR}"/iscsid.socket
+	systemd_dounit "${FILESDIR}/iscsid-initiatorname.service
 	systemd_dotmpfilesd "${FILESDIR}"/open-iscsi.conf
 
 	fperms 600 /etc/iscsi/iscsid.conf
+	rm "${D}"/etc/iscsi/initiatorname.iscsi
 	mv "${D}"/etc/iscsi "${D}"/usr/share/iscsi
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
index 82ea11ca5c..43ecec12d6 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="systemd"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45