diff --git a/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild b/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
index f2d34a2902..e8846ff6be 100644
--- a/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
+++ b/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
@@ -10,7 +10,7 @@ inherit systemd
 
 DESCRIPTION="etcd (System Application Container)"
 HOMEPAGE="https://github.com/coreos/etcd"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 
 LICENSE="Apache-2.0"
 IUSE=""
@@ -22,8 +22,15 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
 S=${WORKDIR}
 
 src_install() {
+	local tag="v3.1.6"
+	if [[ "${ARCH}" != "amd64" ]]; then
+		tag+="-${ARCH}"
+	fi
+
 	exeinto /usr/lib/coreos
 	doexe "${FILESDIR}"/etcd-wrapper
 
-	systemd_dounit "${FILESDIR}"/etcd-member.service
+	sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
+		"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
+	systemd_dounit ${T}/etcd-member.service
 }
diff --git a/app-admin/etcd-wrapper/files/etcd-member.service b/app-admin/etcd-wrapper/files/etcd-member.service
index 0a0697a1c8..319e7ff55b 100644
--- a/app-admin/etcd-wrapper/files/etcd-member.service
+++ b/app-admin/etcd-wrapper/files/etcd-member.service
@@ -12,7 +12,7 @@ RestartSec=10s
 TimeoutStartSec=0
 LimitNOFILE=40000
 
-Environment="ETCD_IMAGE_TAG=v3.1.6"
+Environment="ETCD_IMAGE_TAG=@ETCD_IMAGE_TAG@"
 Environment="ETCD_NAME=%m"
 Environment="ETCD_USER=etcd"
 Environment="ETCD_DATA_DIR=/var/lib/etcd"
diff --git a/coreos-base/coreos/coreos-0.0.1.ebuild b/coreos-base/coreos/coreos-0.0.1.ebuild
index 6911a8e8f9..20d4214af9 100644
--- a/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -75,9 +75,7 @@ RDEPEND="${RDEPEND}
 	)
 	etcd_protocols_2? (
 		dev-db/etcd:2
-		amd64? (
-			app-admin/etcd-wrapper
-		)
+		app-admin/etcd-wrapper
 	)
 	"