diff --git a/Makefile b/Makefile
index 008166ba1..114ae51ed 100644
--- a/Makefile
+++ b/Makefile
@@ -212,9 +212,9 @@ release-server-xgo: check-xgo ## Create server binaries for release using xgo
 	@echo "arch (buildx):$(TARGETARCH_BUILDX)"
 
 	CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -dest ./dist/server/$(TARGETOS)-$(TARGETARCH_XGO) -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external $(LDFLAGS)' -targets '$(TARGETOS)/$(TARGETARCH_XGO)' -out woodpecker-server -pkg cmd/server .
-	mkdir -p ./dist/server/$(TARGETOS)/$(TARGETARCH_BUILDX)
-	mv /build/woodpecker-server-$(TARGETOS)*-$(TARGETARCH_XGO)$(BIN_SUFFIX) ./dist/server/$(TARGETOS)/$(TARGETARCH_BUILDX)/woodpecker-server$(BIN_SUFFIX)
-	[ "${TARGZ}" -eq "1" ] && tar -cvzf dist/woodpecker-server_$(TARGETOS)_$(TARGETARCH_BUILDX).tar.gz -C dist/server/$(TARGETOS)/$(TARGETARCH_BUILDX) woodpecker-server$(BIN_SUFFIX) || echo "skip tar.gz binary"
+	mkdir -p ./dist/server/$(TARGETOS)_$(TARGETARCH_BUILDX)
+	mv /build/woodpecker-server-$(TARGETOS)*-$(TARGETARCH_XGO)$(BIN_SUFFIX) ./dist/server/$(TARGETOS)_$(TARGETARCH_BUILDX)/woodpecker-server$(BIN_SUFFIX)
+	[ "${TARGZ}" -eq "1" ] && tar -cvzf dist/woodpecker-server_$(TARGETOS)_$(TARGETARCH_BUILDX).tar.gz -C dist/server/$(TARGETOS)_$(TARGETARCH_BUILDX) woodpecker-server$(BIN_SUFFIX) || echo "skip tar.gz binary"
 
 release-server: ## Create server binaries for release
 	# compile
diff --git a/docker/Dockerfile.server.alpine.multiarch b/docker/Dockerfile.server.alpine.multiarch
index a608a7cfa..c2513ab35 100644
--- a/docker/Dockerfile.server.alpine.multiarch
+++ b/docker/Dockerfile.server.alpine.multiarch
@@ -12,7 +12,7 @@ ENV XDG_CACHE_HOME=/var/lib/woodpecker
 ENV XDG_DATA_HOME=/var/lib/woodpecker
 EXPOSE 8000 9000 80 443
 
-COPY dist/server/${TARGETOS}/${TARGETARCH}/woodpecker-server /bin/
+COPY dist/server/${TARGETOS}_${TARGETARCH}/woodpecker-server /bin/
 
 HEALTHCHECK CMD ["/bin/woodpecker-server", "ping"]
 ENTRYPOINT ["/bin/woodpecker-server"]
diff --git a/docker/Dockerfile.server.multiarch b/docker/Dockerfile.server.multiarch
index 251d5108b..6555df688 100644
--- a/docker/Dockerfile.server.multiarch
+++ b/docker/Dockerfile.server.multiarch
@@ -12,7 +12,7 @@ EXPOSE 8000 9000 80 443
 # copy certs from certs image
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 # copy server binary
-COPY dist/server/${TARGETOS}/${TARGETARCH}/woodpecker-server /bin/
+COPY dist/server/${TARGETOS}_${TARGETARCH}/woodpecker-server /bin/
 
 HEALTHCHECK CMD ["/bin/woodpecker-server", "ping"]
 ENTRYPOINT ["/bin/woodpecker-server"]