diff --git a/Dockerfile-release.arm64 b/Dockerfile-release.arm64
new file mode 100644
index 000000000..d8816e58d
--- /dev/null
+++ b/Dockerfile-release.arm64
@@ -0,0 +1,11 @@
+FROM aarch64/ubuntu:16.04
+
+ADD etcd /usr/local/bin/
+ADD etcdctl /usr/local/bin/
+ADD var/etcd /var/etcd
+ADD var/lib/etcd /var/lib/etcd
+
+EXPOSE 2379 2380
+
+# Define default command.
+CMD ["/usr/local/bin/etcd"]
diff --git a/Dockerfile-release.ppc64le b/Dockerfile-release.ppc64le
index 06365c8bc..2fb02c412 100644
--- a/Dockerfile-release.ppc64le
+++ b/Dockerfile-release.ppc64le
@@ -2,8 +2,8 @@ FROM ppc64le/ubuntu:16.04
 
 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/
-RUN mkdir -p /var/etcd/
-RUN mkdir -p /var/lib/etcd/
+ADD var/etcd /var/etcd
+ADD var/lib/etcd /var/lib/etcd
 
 EXPOSE 2379 2380
 
diff --git a/scripts/build-docker b/scripts/build-docker
index 44641322f..5c0132136 100755
--- a/scripts/build-docker
+++ b/scripts/build-docker
@@ -1,13 +1,16 @@
 #!/usr/bin/env bash
 
+set -e
+
 if [ "$#" -ne 1 ]; then
 	echo "Usage: $0 VERSION" >&2
 	exit 1
 fi
 
+VERSION=${1}
 ARCH=$(go env GOARCH)
 DOCKERFILE="Dockerfile-release"
-TAG="quay.io/coreos/etcd"
+: ${TAG:="quay.io/coreos/etcd"}
 
 if [ -z ${BINARYDIR} ]; then
 	RELEASE="etcd-${1}"-`go env GOOS`-`go env GOARCH`
@@ -24,7 +27,7 @@ fi
 
 if [ ${ARCH} != "amd64" ]; then
 	DOCKERFILE+=".${ARCH}"
-	TAG+="-${ARCH}"
+	VERSION+="-${ARCH}"
 fi
 
 BINARYDIR=${BINARYDIR:-.}
@@ -32,9 +35,10 @@ BUILDDIR=${BUILDDIR:-.}
 
 IMAGEDIR=${BUILDDIR}/image-docker
 
-mkdir -p ${IMAGEDIR}
+mkdir -p ${IMAGEDIR}/var/etcd
+mkdir -p ${IMAGEDIR}/var/lib/etcd
 cp ${BINARYDIR}/etcd ${BINARYDIR}/etcdctl ${IMAGEDIR}
 
 cat ./${DOCKERFILE} > ${IMAGEDIR}/Dockerfile
 
-docker build -t ${TAG}:${1} ${IMAGEDIR}
+docker build -t ${TAG}:${VERSION} ${IMAGEDIR}