diff --git a/Dockerfile b/Dockerfile
index ff2748d9e..0e266203d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 # Update the base image in Makefile when updating golang version. This has to
 # be pre-pulled in order to work on GCB.
+ARG ARCH
 FROM golang:1.16.8 as build
 
 WORKDIR /go/src/sigs.k8s.io/metrics-server
@@ -16,7 +17,7 @@ ARG GIT_COMMIT
 ARG GIT_TAG
 RUN make metrics-server
 
-FROM gcr.io/distroless/static:latest
+FROM gcr.io/distroless/static:latest-$ARCH
 COPY --from=build /go/src/sigs.k8s.io/metrics-server/metrics-server /
 USER 65534
 ENTRYPOINT ["/metrics-server"]
diff --git a/skaffold.yaml b/skaffold.yaml
index 2140d6ddc..7bbbf03fe 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -11,6 +11,7 @@ build:
     docker:
       dockerfile: Dockerfile
       buildArgs:
+        ARCH: "amd64"
         GIT_TAG: "devel"
 deploy:
   kustomize: