diff --git a/Dockerfile_generator b/Dockerfile_generator
index 13cfc055a..00937b5cb 100644
--- a/Dockerfile_generator
+++ b/Dockerfile_generator
@@ -3,10 +3,10 @@ FROM ${BUILDER_IMAGE} as builder
 
 # Install tools
 RUN go install github.com/vektra/mockery/v2@v2.20.0 && \
-    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 && \
+    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.3 && \
     git clone https://github.com/kubernetes/code-generator -b v0.27.1 --depth 1 && \
     go install k8s.io/code-generator/cmd/go-to-protobuf/...@v0.27.1 && \
-    go install golang.org/x/tools/cmd/goimports@v0.1.1 && \
+    go install golang.org/x/tools/cmd/goimports@v0.8.0 && \
     go install github.com/golang/protobuf/protoc-gen-go@v1.4.3
 
 RUN apt-get update && apt-get install unzip
diff --git a/deployment/base/nfd-crds/nfd-api-crds.yaml b/deployment/base/nfd-crds/nfd-api-crds.yaml
index 775536f28..7136f2094 100644
--- a/deployment/base/nfd-crds/nfd-api-crds.yaml
+++ b/deployment/base/nfd-crds/nfd-api-crds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: nodefeatures.nfd.k8s-sigs.io
 spec:
@@ -114,7 +114,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: nodefeaturerules.nfd.k8s-sigs.io
 spec:
diff --git a/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml b/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml
index 775536f28..7136f2094 100644
--- a/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml
+++ b/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: nodefeatures.nfd.k8s-sigs.io
 spec:
@@ -114,7 +114,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: nodefeaturerules.nfd.k8s-sigs.io
 spec: