diff --git a/pkg/k8s/Makefile b/pkg/k8s/Makefile
index 1f2d35e3abf..8ae725f0355 100644
--- a/pkg/k8s/Makefile
+++ b/pkg/k8s/Makefile
@@ -21,7 +21,26 @@ generate:
 .PHONY: __do_generate
 __do_generate:
 	./tools/controller-gen crd paths=./apis/... output:dir=apis/cilium.io/client/crds/v1alpha1
-	./tools/k8s-code-gen.sh
+	chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh
+	# Do two invocations of generate-groups.sh, one with --plural-exceptions, one without
+	export GOPATH=$$(go env GOPATH); \
+	  bash vendor/k8s.io/code-generator/generate-groups.sh deepcopy,defaulter \
+	  github.com/cilium/tetragon/pkg/k8s/client \
+	  github.com/cilium/tetragon/pkg/k8s/apis \
+	  cilium.io:v1alpha1 \
+	  --go-header-file hack/custom-boilerplate.go.txt \
+	  -o . \
+	  --trim-path-prefix github.com/cilium/tetragon/pkg/k8s \
+	  ; \
+	  bash vendor/k8s.io/code-generator/generate-groups.sh lister,informer,client \
+	  github.com/cilium/tetragon/pkg/k8s/client \
+	  github.com/cilium/tetragon/pkg/k8s/apis \
+	  cilium.io:v1alpha1 \
+	  --go-header-file hack/custom-boilerplate.go.txt \
+	  -o . \
+	  --trim-path-prefix github.com/cilium/tetragon/pkg/k8s \
+	  --plural-exceptions TracingPolicyNamespaced:TracingPoliciesNamespaced \
+	  --plural-exceptions PodInfo:PodInfo \
 
 .PHONY: vendor
 vendor:
diff --git a/pkg/k8s/tools/k8s-code-gen.sh b/pkg/k8s/tools/k8s-code-gen.sh
deleted file mode 100755
index 06b44650e32..00000000000
--- a/pkg/k8s/tools/k8s-code-gen.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-K8S_PKG="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)/.."
-CODEGEN_PKG=$K8S_PKG/vendor/k8s.io/code-generator
-
-source "${CODEGEN_PKG}/kube_codegen.sh"
-
-PLURAL_EXCEPTIONS="TracingPolicyNamespaced:TracingPoliciesNamespaced,PodInfo:PodInfo"
-
-kube::codegen::gen_client \
-    --with-watch \
-    --output-dir "${K8S_PKG}/client" \
-    --output-pkg "github.com/cilium/tetragon/pkg/k8s/client" \
-    --plural-exceptions ${PLURAL_EXCEPTIONS} \
-    --boilerplate "${K8S_PKG}/hack/custom-boilerplate.go.txt" \
-    "${K8S_PKG}/apis"
-
-kube::codegen::gen_helpers \
-    --boilerplate "${K8S_PKG}/hack/custom-boilerplate.go.txt" \
-    "${K8S_PKG}/apis"