diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 84a39e75..4f5920c2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,7 +7,6 @@ on:
       - '*'
   pull_request:
 env:
-  KUBE_BUILDER_VERSION: "2.3.2"
   OPERATOR_SDK_VERSION: "v1.10.0"
 jobs:
   build:
@@ -35,11 +34,6 @@ jobs:
         with:
           go-version: '^1.17'
 
-      - name: Setup env
-        run: |
-          sudo curl -Lo- https://github.com/kubernetes-sigs/kubebuilder/releases/download/v${KUBE_BUILDER_VERSION}/kubebuilder_${KUBE_BUILDER_VERSION}_linux_amd64.tar.gz | tar xzv -C /tmp -f -
-          echo "KUBEBUILDER_ASSETS=/tmp/kubebuilder_${KUBE_BUILDER_VERSION}_linux_amd64/bin" >> $GITHUB_ENV
-
       - name: Test and build image
         run: |
           make test docker-build
diff --git a/Makefile b/Makefile
index f0a9b4bf..73572941 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,15 @@ endif
 all: manager
 
 # Run tests
+KUBEBUILDER_ASSETS=/tmp/envtest_assets.d
+CONTROLLER_RUNTIME_VERSION=v0.8.3
+K8S_VERSION=1.22.0
+GOOS=$(shell go env GOOS)
+GOARCH=$(shell go env GOARCH)
 test: generate fmt vet manifests
-	go test ./... -coverprofile cover.out
+	mkdir -p ${KUBEBUILDER_ASSETS}
+	curl -sSL "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-${K8S_VERSION}-${GOOS}-${GOARCH}.tar.gz" | tar xvz -C ${KUBEBUILDER_ASSETS} --strip-components=2
+	KUBEBUILDER_ASSETS=${KUBEBUILDER_ASSETS} go test ./... -coverprofile cover.out
 
 # Build manager binary
 manager: generate fmt vet
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
index 125425e8..bc8b151a 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*