diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
deleted file mode 100644
index 998a07d6..00000000
--- a/Dockerfile.arm64
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM golang:1.16-buster AS builder
-
-# Copy sources
-WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
-
-# Fetch dependencies
-COPY go.mod go.sum ./
-RUN GO111MODULE=on go mod download
-
-# Now pull in our code
-COPY . .
-
-ARG VERSION
-
-# Build binary and make sure there is at least an empty key file.
-#  This is useful for GCP App Engine custom runtime builds, because
-#  you cannot use multiline variables in their app.yaml, so you have to
-#  build the key into the container and then tell it where it is
-#  by setting OAUTH2_PROXY_JWT_KEY_FILE=/etc/ssl/private/jwt_signing_key.pem
-#  in app.yaml instead.
-RUN VERSION=${VERSION} GOARCH=arm64 make build && touch jwt_signing_key.pem
-
-# Copy binary to alpine
-FROM arm64v8/alpine:3.14
-COPY nsswitch.conf /etc/nsswitch.conf
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy
-COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
-
-USER 2000:2000
-
-ENTRYPOINT ["/bin/oauth2-proxy"]
diff --git a/Dockerfile.armv6 b/Dockerfile.armv6
deleted file mode 100644
index cebc5402..00000000
--- a/Dockerfile.armv6
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM golang:1.16-buster AS builder
-
-# Copy sources
-WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
-
-# Fetch dependencies
-COPY go.mod go.sum ./
-RUN GO111MODULE=on go mod download
-
-# Now pull in our code
-COPY . .
-
-ARG VERSION
-
-# Build binary and make sure there is at least an empty key file.
-#  This is useful for GCP App Engine custom runtime builds, because
-#  you cannot use multiline variables in their app.yaml, so you have to
-#  build the key into the container and then tell it where it is
-#  by setting OAUTH2_PROXY_JWT_KEY_FILE=/etc/ssl/private/jwt_signing_key.pem
-#  in app.yaml instead.
-RUN VERSION=${VERSION} GOARCH=arm GOARM=6 make build && touch jwt_signing_key.pem
-
-# Copy binary to alpine
-FROM arm32v6/alpine:3.14
-COPY nsswitch.conf /etc/nsswitch.conf
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy
-COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem
-
-USER 2000:2000
-
-ENTRYPOINT ["/bin/oauth2-proxy"]
diff --git a/Makefile b/Makefile
index f159655f..5d1f51a7 100644
--- a/Makefile
+++ b/Makefile
@@ -52,13 +52,13 @@ docker:
 
 .PHONY: docker-all
 docker-all: docker
-	$(DOCKER_BUILDX) -f Dockerfile -t $(REGISTRY)/oauth2-proxy:latest-amd64 .
+	$(DOCKER_BUILDX) --platform linux/amd64 -t $(REGISTRY)/oauth2-proxy:latest-amd64 .
 	$(DOCKER_BUILDX_X_PLATFORM) -f Dockerfile -t $(REGISTRY)/oauth2-proxy:${VERSION} .
-	$(DOCKER_BUILDX) -f Dockerfile -t $(REGISTRY)/oauth2-proxy:${VERSION}-amd64 .
-	$(DOCKER_BUILDX) -f Dockerfile.arm64 -t $(REGISTRY)/oauth2-proxy:latest-arm64 .
-	$(DOCKER_BUILDX) -f Dockerfile.arm64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-arm64 .
-	$(DOCKER_BUILDX) -f Dockerfile.armv6 -t $(REGISTRY)/oauth2-proxy:latest-armv6 .
-	$(DOCKER_BUILDX) -f Dockerfile.armv6 -t $(REGISTRY)/oauth2-proxy:${VERSION}-armv6 .
+	$(DOCKER_BUILDX) --platform linux/amd64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-amd64 .
+	$(DOCKER_BUILDX) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:latest-arm64 .
+	$(DOCKER_BUILDX) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-arm64 .
+	$(DOCKER_BUILDX) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:latest-armv6 .
+	$(DOCKER_BUILDX) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:${VERSION}-armv6 .
 
 .PHONY: docker-push
 docker-push:
@@ -66,13 +66,13 @@ docker-push:
 
 .PHONY: docker-push-all
 docker-push-all: docker-push
-	$(DOCKER_BUILDX_PUSH) -t $(REGISTRY)/oauth2-proxy:latest-amd64 .
+	$(DOCKER_BUILDX_PUSH) --platform linux/amd64 -t $(REGISTRY)/oauth2-proxy:latest-amd64 .
 	$(DOCKER_BUILDX_PUSH_X_PLATFORM) -t $(REGISTRY)/oauth2-proxy:${VERSION} .
-	$(DOCKER_BUILDX_PUSH) -t $(REGISTRY)/oauth2-proxy:${VERSION}-amd64 .
-	$(DOCKER_BUILDX_PUSH) -f Dockerfile.arm64 -t $(REGISTRY)/oauth2-proxy:latest-arm64 .
-	$(DOCKER_BUILDX_PUSH) -f Dockerfile.arm64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-arm64 .
-	$(DOCKER_BUILDX_PUSH) -f Dockerfile.armv6 -t $(REGISTRY)/oauth2-proxy:latest-armv6 .
-	$(DOCKER_BUILDX_PUSH) -f Dockerfile.armv6 -t $(REGISTRY)/oauth2-proxy:${VERSION}-armv6 .
+	$(DOCKER_BUILDX_PUSH) --platform linux/amd64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-amd64 .
+	$(DOCKER_BUILDX_PUSH) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:latest-arm64 .
+	$(DOCKER_BUILDX_PUSH) --platform linux/arm64 -t $(REGISTRY)/oauth2-proxy:${VERSION}-arm64 .
+	$(DOCKER_BUILDX_PUSH) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:latest-armv6 .
+	$(DOCKER_BUILDX_PUSH) --platform linux/arm/v6 -t $(REGISTRY)/oauth2-proxy:${VERSION}-armv6 .
 
 .PHONY: generate
 generate: