diff --git a/build/Dockerfile b/build/Dockerfile
index c15d368..b579920 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /build/
 COPY build.sh VERSION /build/
 RUN bash build.sh
 
-FROM ubuntu:20.04
+FROM ubuntu:latest
 LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 
 EXPOSE 25/tcp
diff --git a/build/build-docker.sh b/build/build-docker.sh
index a2c1284..f9e45cd 100644
--- a/build/build-docker.sh
+++ b/build/build-docker.sh
@@ -21,4 +21,4 @@ fi
 echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
 
 # Build multiarch and push
-docker buildx build $BUILD_ARGS --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t ${DOCKER_REPO}:${TAG_TYPE} -t ${DOCKER_REPO}:${TAG_VERSION} --push .
+docker buildx build $BUILD_ARGS --platform linux/amd64,linux/arm64/v8,linux/arm/v7 -t ${DOCKER_REPO}:${TAG_TYPE} -t ${DOCKER_REPO}:${TAG_VERSION} --push .