diff --git a/Dockerfile b/Dockerfile
index a16f90c..633288f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,13 +18,18 @@ RUN <<EOF
   git archive --prefix=github.com/zhsj/wghttp@"$tag"/ -o "$file_prefix".zip HEAD
 EOF
 
-ARG TARGETARCH
+ARG TARGETARCH TARGETVARIANT
 RUN <<EOF
   set -ex
   export CGO_ENABLED=0
-  export GOARCH=$TARGETARCH
   export GOPROXY=file://$(go env GOMODCACHE)/cache/download
   export GOSUMDB=off
+  export GOARCH="$TARGETARCH"
+  case "$TARGETARCH" in
+    arm|arm64)
+      export GOARM=$(echo "$TARGETVARIANT"|sed 's/^v//')
+      ;;
+  esac
   tag=$(git describe --tags --abbrev=8 --always)
   go install -trimpath -ldflags="-w -s" github.com/zhsj/wghttp@"$tag"
   cross_bin=/go/bin/$(go env GOOS)_$(go env GOARCH)/wghttp
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 885a952..8d3c401 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,8 +6,9 @@ target "build" {
   platforms = [
     "linux/386",
     "linux/amd64",
-    "linux/arm",
-    "linux/arm64",
+    "linux/arm/v5",
+    "linux/arm/v7",
+    "linux/arm64/v8",
     "linux/mips",
     "linux/mips64",
     "linux/mips64le",