diff --git a/Makefile b/Makefile
index d42a2e0141c..f7264737d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ generate-vendor: ## Update/generate the vendor by using the path $GOPATH/src/sig
 .PHONY: generate-setup
 generate-setup: ## Current workarround to generate the testdata with the correct controller-gen version
 	- rm -rf $(CONTROLLER_GEN_BIN_PATH)
-	- GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.1
+	- GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.2
 
 ##@ Tests
 
diff --git a/pkg/scaffold/v2/controller.go b/pkg/scaffold/v2/controller.go
index 03a649e5889..964771e572e 100644
--- a/pkg/scaffold/v2/controller.go
+++ b/pkg/scaffold/v2/controller.go
@@ -74,6 +74,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"github.com/go-logr/logr"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	{{ .Resource.GroupImportSafe }}{{ .Resource.Version }} "{{ .ResourcePackage }}/{{ .Resource.Version }}"
 )
diff --git a/testdata/project-v2/controllers/namespace_controller.go b/testdata/project-v2/controllers/namespace_controller.go
index d04e73fcde2..7afaca473ce 100644
--- a/testdata/project-v2/controllers/namespace_controller.go
+++ b/testdata/project-v2/controllers/namespace_controller.go
@@ -20,11 +20,11 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
+	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // NamespaceReconciler reconciles a Namespace object