diff --git a/Makefile b/Makefile
index 966e66c..bd69785 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,8 @@ GOLANGCILINT ?= $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 ADDLICENSE_VERSION ?= v1.1.1
-GOIMPORTS_VERSION ?= v0.14.0
-MOCKGEN_VERSION ?= v0.3.0
+GOIMPORTS_VERSION ?= v0.17.0
+MOCKGEN_VERSION ?= v0.4.0
 GOLANGCILINT_VERSION ?= v1.55.2
 
 .PHONY: addlicense
diff --git a/mock/controller-runtime/client/funcs.go b/mock/controller-runtime/client/funcs.go
index d824534..9b4081b 100644
--- a/mock/controller-runtime/client/funcs.go
+++ b/mock/controller-runtime/client/funcs.go
@@ -9,6 +9,7 @@
 //
 //	mockgen -copyright_file ../../../hack/boilerplate.go.txt -package client -destination funcs.go github.com/ironcore-dev/controller-utils/mock/controller-runtime/client IndexerFunc
 //
+
 // Package client is a generated GoMock package.
 package client
 
diff --git a/mock/controller-runtime/client/mocks.go b/mock/controller-runtime/client/mocks.go
index ce95caa..a9541a4 100644
--- a/mock/controller-runtime/client/mocks.go
+++ b/mock/controller-runtime/client/mocks.go
@@ -9,6 +9,7 @@
 //
 //	mockgen -copyright_file ../../../hack/boilerplate.go.txt -package client -destination mocks.go sigs.k8s.io/controller-runtime/pkg/client Client,FieldIndexer
 //
+
 // Package client is a generated GoMock package.
 package client
 
diff --git a/mock/controller-utils/clientutils/mocks.go b/mock/controller-utils/clientutils/mocks.go
index 5dc8cc8..ddb614b 100644
--- a/mock/controller-utils/clientutils/mocks.go
+++ b/mock/controller-utils/clientutils/mocks.go
@@ -9,6 +9,7 @@
 //
 //	mockgen -copyright_file ../../../hack/boilerplate.go.txt -package clientutils -destination=mocks.go github.com/ironcore-dev/controller-utils/clientutils PatchProvider
 //
+
 // Package clientutils is a generated GoMock package.
 package clientutils
 
diff --git a/mock/controller-utils/metautils/funcs.go b/mock/controller-utils/metautils/funcs.go
index 44a9e03..7943e08 100644
--- a/mock/controller-utils/metautils/funcs.go
+++ b/mock/controller-utils/metautils/funcs.go
@@ -9,6 +9,7 @@
 //
 //	mockgen -copyright_file ../../../hack/boilerplate.go.txt -package metautils -destination=funcs.go github.com/ironcore-dev/controller-utils/mock/controller-utils/metautils EachListItemFunc
 //
+
 // Package metautils is a generated GoMock package.
 package metautils