diff --git a/api/v1beta2/groupversion_info.go b/api/v1beta2/groupversion_info.go
index 3b0b1b7e1..0e19a408d 100644
--- a/api/v1beta2/groupversion_info.go
+++ b/api/v1beta2/groupversion_info.go
@@ -20,18 +20,26 @@ limitations under the License.
 package v1beta2
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta2"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/api/v1beta2/ibmpowervscluster_types.go b/api/v1beta2/ibmpowervscluster_types.go
index b461ee79e..17a37392d 100644
--- a/api/v1beta2/ibmpowervscluster_types.go
+++ b/api/v1beta2/ibmpowervscluster_types.go
@@ -338,5 +338,5 @@ func (rf *ResourceReference) Set(resource ResourceReference) {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMPowerVSCluster{}, &IBMPowerVSClusterList{})
+	objectTypes = append(objectTypes, &IBMPowerVSCluster{}, &IBMPowerVSClusterList{})
 }
diff --git a/api/v1beta2/ibmpowervsclustertemplate_types.go b/api/v1beta2/ibmpowervsclustertemplate_types.go
index 7e01b2c7e..202a6b188 100644
--- a/api/v1beta2/ibmpowervsclustertemplate_types.go
+++ b/api/v1beta2/ibmpowervsclustertemplate_types.go
@@ -59,5 +59,5 @@ type IBMPowerVSClusterTemplateResource struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMPowerVSClusterTemplate{}, &IBMPowerVSClusterTemplateList{})
+	objectTypes = append(objectTypes, &IBMPowerVSClusterTemplate{}, &IBMPowerVSClusterTemplateList{})
 }
diff --git a/api/v1beta2/ibmpowervsimage_types.go b/api/v1beta2/ibmpowervsimage_types.go
index 0d92d0139..4431e5fa0 100644
--- a/api/v1beta2/ibmpowervsimage_types.go
+++ b/api/v1beta2/ibmpowervsimage_types.go
@@ -131,5 +131,5 @@ type IBMPowerVSImageList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMPowerVSImage{}, &IBMPowerVSImageList{})
+	objectTypes = append(objectTypes, &IBMPowerVSImage{}, &IBMPowerVSImageList{})
 }
diff --git a/api/v1beta2/ibmpowervsmachine_types.go b/api/v1beta2/ibmpowervsmachine_types.go
index 9c2f92b65..df9ea4e58 100644
--- a/api/v1beta2/ibmpowervsmachine_types.go
+++ b/api/v1beta2/ibmpowervsmachine_types.go
@@ -271,5 +271,5 @@ type IBMPowerVSMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMPowerVSMachine{}, &IBMPowerVSMachineList{})
+	objectTypes = append(objectTypes, &IBMPowerVSMachine{}, &IBMPowerVSMachineList{})
 }
diff --git a/api/v1beta2/ibmpowervsmachinetemplate_types.go b/api/v1beta2/ibmpowervsmachinetemplate_types.go
index 63e4fd472..fd26eee6c 100644
--- a/api/v1beta2/ibmpowervsmachinetemplate_types.go
+++ b/api/v1beta2/ibmpowervsmachinetemplate_types.go
@@ -65,5 +65,5 @@ type IBMPowerVSMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMPowerVSMachineTemplate{}, &IBMPowerVSMachineTemplateList{})
+	objectTypes = append(objectTypes, &IBMPowerVSMachineTemplate{}, &IBMPowerVSMachineTemplateList{})
 }
diff --git a/api/v1beta2/ibmvpccluster_types.go b/api/v1beta2/ibmvpccluster_types.go
index b4ed7037b..60caf354d 100644
--- a/api/v1beta2/ibmvpccluster_types.go
+++ b/api/v1beta2/ibmvpccluster_types.go
@@ -385,10 +385,6 @@ type IBMVPCClusterList struct {
 	Items           []IBMVPCCluster `json:"items"`
 }
 
-func init() {
-	SchemeBuilder.Register(&IBMVPCCluster{}, &IBMVPCClusterList{})
-}
-
 // GetConditions returns the observations of the operational state of the IBMVPCCluster resource.
 func (r *IBMVPCCluster) GetConditions() capiv1beta1.Conditions {
 	return r.Status.Conditions
@@ -398,3 +394,7 @@ func (r *IBMVPCCluster) GetConditions() capiv1beta1.Conditions {
 func (r *IBMVPCCluster) SetConditions(conditions capiv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
+
+func init() {
+	objectTypes = append(objectTypes, &IBMVPCCluster{}, &IBMVPCClusterList{})
+}
diff --git a/api/v1beta2/ibmvpcclustertemplate_types.go b/api/v1beta2/ibmvpcclustertemplate_types.go
index 2121d38a1..855920c0c 100644
--- a/api/v1beta2/ibmvpcclustertemplate_types.go
+++ b/api/v1beta2/ibmvpcclustertemplate_types.go
@@ -58,5 +58,5 @@ type IBMVPCClusterTemplateResource struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMVPCClusterTemplate{}, &IBMVPCClusterTemplateList{})
+	objectTypes = append(objectTypes, &IBMVPCClusterTemplate{}, &IBMVPCClusterTemplateList{})
 }
diff --git a/api/v1beta2/ibmvpcmachine_types.go b/api/v1beta2/ibmvpcmachine_types.go
index 05a5dfe31..df3aae0db 100644
--- a/api/v1beta2/ibmvpcmachine_types.go
+++ b/api/v1beta2/ibmvpcmachine_types.go
@@ -212,5 +212,5 @@ type IBMVPCMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMVPCMachine{}, &IBMVPCMachineList{})
+	objectTypes = append(objectTypes, &IBMVPCMachine{}, &IBMVPCMachineList{})
 }
diff --git a/api/v1beta2/ibmvpcmachinetemplate_types.go b/api/v1beta2/ibmvpcmachinetemplate_types.go
index 3dd623f78..210b9617c 100644
--- a/api/v1beta2/ibmvpcmachinetemplate_types.go
+++ b/api/v1beta2/ibmvpcmachinetemplate_types.go
@@ -65,5 +65,5 @@ type IBMVPCMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IBMVPCMachineTemplate{}, &IBMVPCMachineTemplateList{})
+	objectTypes = append(objectTypes, &IBMVPCMachineTemplate{}, &IBMVPCMachineTemplateList{})
 }