diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch
index 3b9dc458..48787398 100644
--- a/Dockerfile.multiarch
+++ b/Dockerfile.multiarch
@@ -2,7 +2,7 @@ FROM --platform=$BUILDPLATFORM golang:1.19 as build-env
 
 # xx wraps go to automatically configure $GOOS, $GOARCH, and $GOARM
 # based on TARGETPLATFORM provided by Docker.
-COPY --from=tonistiigi/xx:golang-1.0.0 / /
+COPY --from=tonistiigi/xx:1.6.1 / /
 
 ARG APP_FOLDER
 
@@ -11,7 +11,7 @@ WORKDIR ${APP_FOLDER}
 
 # Compile independent executable using go wrapper from xx:golang
 ARG TARGETPLATFORM
-RUN CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o /bin/main ./cmd/nfs-subdir-external-provisioner
+RUN CGO_ENABLED=0 xx-go build -a -ldflags '-extldflags "-static"' -o /bin/main ./cmd/nfs-subdir-external-provisioner
 
 FROM --platform=$TARGETPLATFORM alpine:3.18