diff --git a/Makefile b/Makefile
index 2150dec7b8..2a804b9701 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,6 @@ test: build-dirs
 
 codegen:
 	@$(MAKE) run CMD='-c "                       \
-		PATH=$$GOPATH/bin:$$GOROOT/bin::$${PATH} \
 		./build/codegen.sh                       \
 	"'
 
diff --git a/build/codegen.sh b/build/codegen.sh
index 26fc87a791..627e8057ec 100755
--- a/build/codegen.sh
+++ b/build/codegen.sh
@@ -16,16 +16,15 @@
 
 set -o errexit
 set -o nounset
+set -o xtrace
 
-# This is a workaround for the fact that codegen requires this boilerplate file
-# to exist in GOPATH. If this file isn't present, we'll use an empty one.
-boilerplate="${GOPATH}/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt"
-mkdir -p $(dirname "${boilerplate}")
-touch "${boilerplate}"
-
-pushd vendor/k8s.io/code-generator
-./generate-groups.sh                        \
-  all                                       \
-  github.com/kanisterio/kanister/pkg/client \
-  github.com/kanisterio/kanister/pkg/apis   \
-  "cr:v1alpha1"                             \
+export GO111MODULE=on
+go mod download
+execDir="/go/pkg/mod/k8s.io/code-generator@$(go list -f '{{.Version}}' -m k8s.io/code-generator)"
+chmod +x "${execDir}"/generate-groups.sh
+"${execDir}"/generate-groups.sh                         \
+  all                                        \
+  github.com/kanisterio/kanister/pkg/client  \
+  github.com/kanisterio/kanister/pkg/apis    \
+  "cr:v1alpha1"                              \
+  --go-header-file "${execDir}"/hack/boilerplate.go.txt
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index d072e9c2ed..2afe3034df 100644
--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -28,8 +28,6 @@ import (
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
 	CrV1alpha1() crv1alpha1.CrV1alpha1Interface
-	// Deprecated: please explicitly pick a version if possible.
-	Cr() crv1alpha1.CrV1alpha1Interface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
@@ -44,12 +42,6 @@ func (c *Clientset) CrV1alpha1() crv1alpha1.CrV1alpha1Interface {
 	return c.crV1alpha1
 }
 
-// Deprecated: Cr retrieves the default version of CrClient.
-// Please explicitly pick a version.
-func (c *Clientset) Cr() crv1alpha1.CrV1alpha1Interface {
-	return c.crV1alpha1
-}
-
 // Discovery retrieves the DiscoveryClient
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	if c == nil {
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index 2d384d373d..fe57e0c1ec 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -75,8 +75,3 @@ var _ clientset.Interface = &Clientset{}
 func (c *Clientset) CrV1alpha1() crv1alpha1.CrV1alpha1Interface {
 	return &fakecrv1alpha1.FakeCrV1alpha1{Fake: &c.Fake}
 }
-
-// Cr retrieves the CrV1alpha1Client
-func (c *Clientset) Cr() crv1alpha1.CrV1alpha1Interface {
-	return &fakecrv1alpha1.FakeCrV1alpha1{Fake: &c.Fake}
-}