diff --git a/hack/make/.binary b/hack/make/.binary
index 8c1769ec1e..1b66ff7fbf 100644
--- a/hack/make/.binary
+++ b/hack/make/.binary
@@ -71,14 +71,11 @@ source "${MAKEDIR}/.go-autogen"
 		fi
 	fi
 
-	# -buildmode=pie is not supported on Windows and Linux on mips, riscv64 and ppc64be.
-	# https://github.com/golang/go/blob/77aa209b386a184e7f4b44938f2a05a1b5c5a3cf/src/cmd/internal/sys/supported.go#L89-L99
+	# -buildmode=pie is not supported on Windows arm64 and Linux mips*, ppc64be
+	# https://github.com/golang/go/blob/go1.19.4/src/cmd/internal/sys/supported.go#L125-L132
 	if ! [ "$DOCKER_STATIC" = "1" ]; then
 		case "$(go env GOOS)/$(go env GOARCH)" in
-			windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;;
-			# TODO remove windows in Go 1.15+: https://github.com/golang/go/commit/95f382139043059a2a0780ba577b53893408f7e4
-			# TODO remove riscv64 in Go 1.16+: https://github.com/golang/go/commit/8eb846fd37eb7bded8a1cf6932be2c59069863e5
-	
+			windows/arm64 | linux/mips* | linux/ppc64) ;;
 			*)
 				BUILDFLAGS+=("-buildmode=pie")
 				;;