diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.6.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.6.2-r2
index 710d9a706c..dc3184d7f6 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.6.2-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-firewall/iptables-1.6.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
 EAPI=6
 HOMEPAGE=https://www.netfilter.org/projects/iptables/
 IUSE=conntrack ipv6 netlink nftables pcap static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.0.5:0= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes )
 SLOT=0/12
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.6.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31725eeb8a1903749ec428aea6abdd02
+_md5_=af7ecc93bf9220e6579465f246865620
diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.6.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.6.2-r2.ebuild
index 6688c68b71..13fd5446db 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.6.2-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/iptables/iptables-1.6.2-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 # Subslot tracks libxtables as that's the one other packages generally link
 # against and iptables changes.  Will have to revisit if other sonames change.
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 COMMON_DEPEND="
@@ -111,9 +111,9 @@ src_install() {
 		rm "${ED%/}"/etc/ethertypes || die
 	fi
 
-	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
+	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
 	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
+		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
 	fi
 
 	# Move important libs to /lib #332175