diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9192cdf168..35aa1f9c37 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -47,6 +47,7 @@ jobs:
 
       - name: goimports
         run: |
+          go install golang.org/x/tools/cmd/goimports@latest
           if [ "$(goimports -l . | wc -l)" -ne 0 ]
           then
            echo "The following files were found to have import formatting issues:"
diff --git a/Makefile b/Makefile
index b92d02fd6a..b88cd4167c 100644
--- a/Makefile
+++ b/Makefile
@@ -400,8 +400,8 @@ CONTROLLER_GEN=$(shell which controller-gen)
 endif
 
 .PHONY: deepcopy-autogen
-deepcopy-autogen: controller-gen ## Generate deep copy code
-	$(CONTROLLER_GEN) object:headerFile="scripts/boilerplate.go.txt" paths="./..."
+deepcopy-autogen: controller-gen goimports ## Generate deep copy code
+	$(CONTROLLER_GEN) object:headerFile="scripts/boilerplate.go.txt" paths="./..." && $(GO_IMPORTS) -w ./api/
 
 .PHONY: codegen
 codegen: kyverno-crd report-crd deepcopy-autogen generate-api-docs gen-helm ## Update all generated code and docs
diff --git a/api/kyverno/v1alpha2/zz_generated.deepcopy.go b/api/kyverno/v1alpha2/zz_generated.deepcopy.go
index 776cc4522b..a94a3d9338 100644
--- a/api/kyverno/v1alpha2/zz_generated.deepcopy.go
+++ b/api/kyverno/v1alpha2/zz_generated.deepcopy.go
@@ -21,7 +21,7 @@ package v1alpha2
 
 import (
 	policyreportv1alpha2 "github.com/kyverno/kyverno/api/policyreport/v1alpha2"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
diff --git a/api/kyverno/v1beta1/zz_generated.deepcopy.go b/api/kyverno/v1beta1/zz_generated.deepcopy.go
index b388639dd6..8fdb176a9f 100644
--- a/api/kyverno/v1beta1/zz_generated.deepcopy.go
+++ b/api/kyverno/v1beta1/zz_generated.deepcopy.go
@@ -20,7 +20,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/kyverno/kyverno/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	admissionv1 "k8s.io/api/admission/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
diff --git a/api/policyreport/v1alpha2/zz_generated.deepcopy.go b/api/policyreport/v1alpha2/zz_generated.deepcopy.go
index 8cee95e3b6..4023b18f15 100644
--- a/api/policyreport/v1alpha2/zz_generated.deepcopy.go
+++ b/api/policyreport/v1alpha2/zz_generated.deepcopy.go
@@ -20,7 +20,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )