diff --git a/Makefile b/Makefile
index ed6c10df9..04cd39d83 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ IMAGE_BUILD_CMD ?= docker build
 IMAGE_BUILD_EXTRA_OPTS ?=
 IMAGE_PUSH_CMD ?= docker push
 CONTAINER_RUN_CMD ?= docker run
-BUILDER_IMAGE ?= golang:1.23-bookworm
+BUILDER_IMAGE ?= golang:1.24-bookworm
 BASE_IMAGE_FULL ?= debian:bookworm-slim
 BASE_IMAGE_MINIMAL ?= scratch
 
diff --git a/Tiltfile b/Tiltfile
index e5fe0dded..696810584 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -2,7 +2,7 @@
 
 BASE_IMAGE_MINIMAL="gcr.io/distroless/base"
 BASE_IMAGE_FULL="debian:bullseye-slim"
-BUILDER_IMAGE="golang:1.23-bookworm"
+BUILDER_IMAGE="golang:1.24-bookworm"
 HOSTMOUNT_PREFIX="/host-"
 IMAGE_TAG_NAME = os.getenv('IMAGE_TAG_NAME', "master")
 IMAGE_REGISTRY = os.getenv('IMAGE_REGISTRY', "gcr.io/k8s-staging-nfd")
diff --git a/go.mod b/go.mod
index 4032be170..5d843ae81 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/node-feature-discovery
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/fsnotify/fsnotify v1.8.0
@@ -28,7 +28,6 @@ require (
 	k8s.io/apiextensions-apiserver v0.32.1
 	k8s.io/apimachinery v0.32.1
 	k8s.io/client-go v0.32.1
-	k8s.io/code-generator v0.32.1
 	k8s.io/component-base v0.32.1
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.32.1
@@ -153,6 +152,7 @@ require (
 	howett.net/plist v1.0.0 // indirect
 	k8s.io/apiserver v0.32.1 // indirect
 	k8s.io/cloud-provider v0.32.1 // indirect
+	k8s.io/code-generator v0.32.1 // indirect
 	k8s.io/component-helpers v0.32.1 // indirect
 	k8s.io/controller-manager v0.32.1 // indirect
 	k8s.io/cri-api v0.32.1 // indirect
@@ -201,3 +201,5 @@ replace (
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1
 	sigs.k8s.io/node-feature-discovery/api/nfd => ./api/nfd
 )
+
+tool k8s.io/code-generator
diff --git a/hack/tools.go b/hack/tools.go
deleted file mode 100644
index e38e6c643..000000000
--- a/hack/tools.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2024 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This package imports things required by build scripts, to force `go mod` to see them as dependencies
-package tools
-
-import _ "k8s.io/code-generator"
diff --git a/scripts/test-infra/verify.sh b/scripts/test-infra/verify.sh
index bd041d0f4..c6b957c28 100755
--- a/scripts/test-infra/verify.sh
+++ b/scripts/test-infra/verify.sh
@@ -4,7 +4,7 @@ this_dir=`dirname $0`
 
 # Install deps
 gobinpath="$(go env GOPATH)/bin"
-curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "$gobinpath" v1.60.3
+curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "$gobinpath" v1.64.5
 export PATH=$PATH:$(go env GOPATH)/bin
 
 curl -sfL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -s -- --version v3.15.3