diff --git a/Dockerfile b/Dockerfile
index b69e5b656..a858905f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,14 +18,14 @@ ADD . .
 RUN make
 
 # 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-amd64:buster-v1.5.0 as mad-hack
 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-amd64:buster-v1.5.0
 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
-COPY --from=base /lib/udev/scsi_id /lib/udev_containerized/scsi_id
+COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
 
 ENTRYPOINT ["/gce-pd-csi-driver"]
diff --git a/deploy/kubernetes/install-kustomize.sh b/deploy/kubernetes/install-kustomize.sh
index 49d2a8068..88c41913b 100755
--- a/deploy/kubernetes/install-kustomize.sh
+++ b/deploy/kubernetes/install-kustomize.sh
@@ -40,21 +40,26 @@ trap cleanup EXIT
 pushd $tmpDir >& /dev/null
 
 opsys=windows
+arch=amd64
 if [[ "$OSTYPE" == linux* ]]; then
-  opsys=linux_amd64
+  opsys=linux
 elif [[ "$OSTYPE" == darwin* ]]; then
   opsys=darwin
 fi
 
-curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases |\
-  grep browser_download |\
-  grep $opsys |\
+# As github has a limit on what stored in releases/, and kustomize has many different package
+# versions, we just point directly at the version we want. See 
+# github.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh.
+
+version=v3.9.4
+url_base=https://api.github.com/repos/kubernetes-sigs/kustomize/releases/tags/kustomize%2F
+curl -s ${url_base}${version} |\
+  grep browser_download.*${opsys}_${arch} |\
   cut -d '"' -f 4 |\
-  grep /kustomize/v3.9.4 |\
-  sort | tail -n 1 |\
+  sort -V | tail -n 1 |\
   xargs curl -s -O -L
 
-tar xzf ./kustomize_v*_${opsys}.tar.gz
+tar xzf ./kustomize_v*_${opsys}_${arch}.tar.gz
 
 cp ./kustomize $where