diff --git a/Makefile b/Makefile
index 83e82434..9249ecbb 100644
--- a/Makefile
+++ b/Makefile
@@ -140,18 +140,16 @@ manifests: $(CONTROLLER_GEN) ## Generate WebhookConfiguration, ClusterRole and C
 generate: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..." paths="./exp/api/..."
 	$(CONVERSION_GEN) \
-	    --input-dirs=./api/v1beta1 \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
-		--build-tag=ignore_autogenerated_conversions \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=hack/boilerplate.go.txt $(OUTPUT_BASE)
+		--output-file=zz_generated.conversion.go \
+		--go-header-file=hack/boilerplate.go.txt \
+		./api/v1beta1
 	$(CONVERSION_GEN) \
-	    --input-dirs=./exp/api/v1beta1 \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
 		--extra-peer-dirs=github.com/oracle/cluster-api-provider-oci/api/v1beta1 \
-		--build-tag=ignore_autogenerated_conversions \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=hack/boilerplate.go.txt $(OUTPUT_BASE)
+		--output-file=zz_generated.conversion.go \
+		--go-header-file=hack/boilerplate.go.txt \
+		./exp/api/v1beta1
 
 fmt: ## Run go fmt against code.
 	go fmt ./...
diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
index fdfdc5ce..70c635b4 100644
--- a/api/v1beta1/zz_generated.conversion.go
+++ b/api/v1beta1/zz_generated.conversion.go
@@ -1,5 +1,5 @@
-//go:build !ignore_autogenerated_conversions
-// +build !ignore_autogenerated_conversions
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
 Copyright (c) 2022, Oracle and/or its affiliates.
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
index 8d0960c5..b262bd21 100644
--- a/api/v1beta1/zz_generated.deepcopy.go
+++ b/api/v1beta1/zz_generated.deepcopy.go
@@ -23,7 +23,7 @@ package v1beta1
 import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 	apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/exp/api/v1beta1/zz_generated.conversion.go b/exp/api/v1beta1/zz_generated.conversion.go
index 16409032..dc0ec9b3 100644
--- a/exp/api/v1beta1/zz_generated.conversion.go
+++ b/exp/api/v1beta1/zz_generated.conversion.go
@@ -1,5 +1,5 @@
-//go:build !ignore_autogenerated_conversions
-// +build !ignore_autogenerated_conversions
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
 Copyright (c) 2022, Oracle and/or its affiliates.
diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go
index 0590108d..dac322bc 100644
--- a/exp/api/v1beta1/zz_generated.deepcopy.go
+++ b/exp/api/v1beta1/zz_generated.deepcopy.go
@@ -22,7 +22,7 @@ package v1beta1
 
 import (
 	cluster_api_provider_ociapiv1beta1 "github.com/oracle/cluster-api-provider-oci/api/v1beta1"
-	"k8s.io/apimachinery/pkg/runtime"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 	apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
 )