diff --git a/Dockerfile b/Dockerfile
index b69e5b656..904939505 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,14 +15,14 @@
 FROM golang:1.13.15 as builder
 WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 ADD . .
-RUN make
+RUN make gce-pd-driver
 
 # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3 as base
+FROM k8s.gcr.io/build-image/debian-base:v2.1.3 as base
 RUN clean-install udev
 
 # Start from Kubernetes Debian base
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
+FROM k8s.gcr.io/build-image/debian-base:v2.1.3
 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
 # Install necessary dependencies
 RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
diff --git a/Makefile b/Makefile
index fd6b632d9..63ecc8d94 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ push-container: build-container
 	gcloud docker -- push $(STAGINGIMAGE):$(STAGINGVERSION)
 
 build-and-push-container-linux: require-GCE_PD_CSI_STAGING_IMAGE init-buildx
-	$(DOCKER) buildx build --platform=linux \
+	$(DOCKER) buildx build --platform=linux/amd64,linux/arm64 \
 		-t $(STAGINGIMAGE):$(STAGINGVERSION)_linux \
 		--build-arg TAG=$(STAGINGVERSION) --push .
 
@@ -97,8 +97,8 @@ endif
 
 init-buildx:
 	# Ensure we use a builder that can leverage it (the default on linux will not)
-	-$(DOCKER) buildx rm windows-builder
-	$(DOCKER) buildx create --use --name=windows-builder
+	-$(DOCKER) buildx rm multiarch-multiplatform-builder
+	$(DOCKER) buildx create --use --name=multiarch-multiplatform-builder
 	# Register gcloud as a Docker credential helper.
 	# Required for "docker buildx build --push".
 	gcloud auth configure-docker --quiet