diff --git a/Dockerfile b/Dockerfile
index 2e6062ec5..06e6475c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,15 +24,15 @@ ADD . .
 RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION 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:buster-v1.6.0 as mad-hack
-RUN ln -s /bin/rm /usr/sbin/rm \
+FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as mad-hack
+RUN ln -fs /bin/rm /usr/sbin/rm \
   && clean-install udev
 
 # Start from Kubernetes Debian base
-FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0
+FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.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 ln -s /bin/rm /usr/sbin/rm \
+RUN ln -fs /bin/rm /usr/sbin/rm \
   && clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
 COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
 
diff --git a/pkg/gce-pd-csi-driver/utils_linux.go b/pkg/gce-pd-csi-driver/utils_linux.go
index a56a21957..35d24701b 100644
--- a/pkg/gce-pd-csi-driver/utils_linux.go
+++ b/pkg/gce-pd-csi-driver/utils_linux.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/gce-pd-csi-driver/utils_windows.go b/pkg/gce-pd-csi-driver/utils_windows.go
index 64ace7ce8..4e775649a 100644
--- a/pkg/gce-pd-csi-driver/utils_windows.go
+++ b/pkg/gce-pd-csi-driver/utils_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/pkg/mount-manager/safe-mounter-v1_windows.go b/pkg/mount-manager/safe-mounter-v1_windows.go
index 03c97bc48..2568a8631 100644
--- a/pkg/mount-manager/safe-mounter-v1_windows.go
+++ b/pkg/mount-manager/safe-mounter-v1_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/pkg/mount-manager/safe-mounter-v1beta_windows.go b/pkg/mount-manager/safe-mounter-v1beta_windows.go
index b96db39ff..04b8a4386 100644
--- a/pkg/mount-manager/safe-mounter-v1beta_windows.go
+++ b/pkg/mount-manager/safe-mounter-v1beta_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/pkg/mount-manager/safe-mounter_linux.go b/pkg/mount-manager/safe-mounter_linux.go
index b807458d7..98d32f789 100644
--- a/pkg/mount-manager/safe-mounter_linux.go
+++ b/pkg/mount-manager/safe-mounter_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/mount-manager/safe-mounter_windows.go b/pkg/mount-manager/safe-mounter_windows.go
index fb95b0c05..ac31a794b 100644
--- a/pkg/mount-manager/safe-mounter_windows.go
+++ b/pkg/mount-manager/safe-mounter_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/pkg/mount-manager/statter_windows.go b/pkg/mount-manager/statter_windows.go
index 78dfbc3ef..ce2e055ef 100644
--- a/pkg/mount-manager/statter_windows.go
+++ b/pkg/mount-manager/statter_windows.go
@@ -1,4 +1,6 @@
+//go:build windows
 // +build windows
+
 /*
 Copyright 2019 The Kubernetes Authors.
 
diff --git a/pkg/resizefs/resizefs_linux.go b/pkg/resizefs/resizefs_linux.go
index 7f23a89f7..e8c695571 100644
--- a/pkg/resizefs/resizefs_linux.go
+++ b/pkg/resizefs/resizefs_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/resizefs/resizefs_windows.go b/pkg/resizefs/resizefs_windows.go
index 8065db0a6..38b7ab667 100644
--- a/pkg/resizefs/resizefs_windows.go
+++ b/pkg/resizefs/resizefs_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*