diff --git a/operator/api/v1alpha1/aiinsight_types.go b/operator/api/v1alpha1/aiinsight_types.go
index 49147598..2bfaae01 100644
--- a/operator/api/v1alpha1/aiinsight_types.go
+++ b/operator/api/v1alpha1/aiinsight_types.go
@@ -103,7 +103,3 @@ type AIInsightList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []AIInsight `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&AIInsight{}, &AIInsightList{})
-}
diff --git a/operator/api/v1alpha1/anomaly_types.go b/operator/api/v1alpha1/anomaly_types.go
index 10a9f190..e842819b 100644
--- a/operator/api/v1alpha1/anomaly_types.go
+++ b/operator/api/v1alpha1/anomaly_types.go
@@ -102,7 +102,3 @@ type AnomalyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Anomaly `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Anomaly{}, &AnomalyList{})
-}
diff --git a/operator/api/v1alpha1/approvalpolicy_types.go b/operator/api/v1alpha1/approvalpolicy_types.go
index 97d21f3d..c777bb23 100644
--- a/operator/api/v1alpha1/approvalpolicy_types.go
+++ b/operator/api/v1alpha1/approvalpolicy_types.go
@@ -166,7 +166,3 @@ type ApprovalPolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ApprovalPolicy `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ApprovalPolicy{}, &ApprovalPolicyList{})
-}
diff --git a/operator/api/v1alpha1/approvalrequest_types.go b/operator/api/v1alpha1/approvalrequest_types.go
index d6805eb5..b5c876d6 100644
--- a/operator/api/v1alpha1/approvalrequest_types.go
+++ b/operator/api/v1alpha1/approvalrequest_types.go
@@ -149,7 +149,3 @@ type ApprovalRequestList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ApprovalRequest `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ApprovalRequest{}, &ApprovalRequestList{})
-}
diff --git a/operator/api/v1alpha1/auditevent_types.go b/operator/api/v1alpha1/auditevent_types.go
index 5e0113b2..4d2d4351 100644
--- a/operator/api/v1alpha1/auditevent_types.go
+++ b/operator/api/v1alpha1/auditevent_types.go
@@ -88,7 +88,3 @@ type AuditEventList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []AuditEvent `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&AuditEvent{}, &AuditEventList{})
-}
diff --git a/operator/api/v1alpha1/chaosexperiment_types.go b/operator/api/v1alpha1/chaosexperiment_types.go
index 1ebe2068..6d552757 100644
--- a/operator/api/v1alpha1/chaosexperiment_types.go
+++ b/operator/api/v1alpha1/chaosexperiment_types.go
@@ -185,7 +185,3 @@ type ChaosExperimentList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ChaosExperiment `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ChaosExperiment{}, &ChaosExperimentList{})
-}
diff --git a/operator/api/v1alpha1/clusterregistration_types.go b/operator/api/v1alpha1/clusterregistration_types.go
index f1531d69..2a2259bd 100644
--- a/operator/api/v1alpha1/clusterregistration_types.go
+++ b/operator/api/v1alpha1/clusterregistration_types.go
@@ -100,7 +100,3 @@ type ClusterRegistrationList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ClusterRegistration `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ClusterRegistration{}, &ClusterRegistrationList{})
-}
diff --git a/operator/api/v1alpha1/escalationpolicy_types.go b/operator/api/v1alpha1/escalationpolicy_types.go
index a7998365..b43828a0 100644
--- a/operator/api/v1alpha1/escalationpolicy_types.go
+++ b/operator/api/v1alpha1/escalationpolicy_types.go
@@ -122,7 +122,3 @@ type EscalationPolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []EscalationPolicy `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&EscalationPolicy{}, &EscalationPolicyList{})
-}
diff --git a/operator/api/v1alpha1/groupversion_info.go b/operator/api/v1alpha1/groupversion_info.go
index f6e14abe..799a3a6a 100644
--- a/operator/api/v1alpha1/groupversion_info.go
+++ b/operator/api/v1alpha1/groupversion_info.go
@@ -4,8 +4,9 @@
 package v1alpha1
 
 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 (
@@ -13,8 +14,32 @@ var (
 	GroupVersion = schema.GroupVersion{Group: "platform.chatcli.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionResource scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&AIInsight{}, &AIInsightList{},
+		&Anomaly{}, &AnomalyList{},
+		&ApprovalPolicy{}, &ApprovalPolicyList{},
+		&ApprovalRequest{}, &ApprovalRequestList{},
+		&AuditEvent{}, &AuditEventList{},
+		&ChaosExperiment{}, &ChaosExperimentList{},
+		&ClusterRegistration{}, &ClusterRegistrationList{},
+		&EscalationPolicy{}, &EscalationPolicyList{},
+		&IncidentSLA{}, &IncidentSLAList{},
+		&Instance{}, &InstanceList{},
+		&Issue{}, &IssueList{},
+		&NotificationPolicy{}, &NotificationPolicyList{},
+		&PostMortem{}, &PostMortemList{},
+		&RemediationPlan{}, &RemediationPlanList{},
+		&Runbook{}, &RunbookList{},
+		&ServiceLevelObjective{}, &ServiceLevelObjectiveList{},
+		&SourceRepository{}, &SourceRepositoryList{},
+	)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/operator/api/v1alpha1/incidentsla_types.go b/operator/api/v1alpha1/incidentsla_types.go
index 4836b79e..c447dd32 100644
--- a/operator/api/v1alpha1/incidentsla_types.go
+++ b/operator/api/v1alpha1/incidentsla_types.go
@@ -133,7 +133,3 @@ type IncidentSLAList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []IncidentSLA `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&IncidentSLA{}, &IncidentSLAList{})
-}
diff --git a/operator/api/v1alpha1/instance_types.go b/operator/api/v1alpha1/instance_types.go
index 555a0930..e67f4f9e 100644
--- a/operator/api/v1alpha1/instance_types.go
+++ b/operator/api/v1alpha1/instance_types.go
@@ -553,7 +553,3 @@ type InstanceList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Instance `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Instance{}, &InstanceList{})
-}
diff --git a/operator/api/v1alpha1/issue_types.go b/operator/api/v1alpha1/issue_types.go
index 606cd2e3..398fd73a 100644
--- a/operator/api/v1alpha1/issue_types.go
+++ b/operator/api/v1alpha1/issue_types.go
@@ -133,7 +133,3 @@ type IssueList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Issue `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Issue{}, &IssueList{})
-}
diff --git a/operator/api/v1alpha1/notificationpolicy_types.go b/operator/api/v1alpha1/notificationpolicy_types.go
index abc82236..133cd78a 100644
--- a/operator/api/v1alpha1/notificationpolicy_types.go
+++ b/operator/api/v1alpha1/notificationpolicy_types.go
@@ -171,7 +171,3 @@ type NotificationPolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []NotificationPolicy `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&NotificationPolicy{}, &NotificationPolicyList{})
-}
diff --git a/operator/api/v1alpha1/postmortem_types.go b/operator/api/v1alpha1/postmortem_types.go
index 80355991..d698d45a 100644
--- a/operator/api/v1alpha1/postmortem_types.go
+++ b/operator/api/v1alpha1/postmortem_types.go
@@ -257,7 +257,3 @@ type PostMortemList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []PostMortem `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&PostMortem{}, &PostMortemList{})
-}
diff --git a/operator/api/v1alpha1/remediationplan_types.go b/operator/api/v1alpha1/remediationplan_types.go
index 0cdde0dc..03420543 100644
--- a/operator/api/v1alpha1/remediationplan_types.go
+++ b/operator/api/v1alpha1/remediationplan_types.go
@@ -381,7 +381,3 @@ type RemediationPlanList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RemediationPlan `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RemediationPlan{}, &RemediationPlanList{})
-}
diff --git a/operator/api/v1alpha1/runbook_types.go b/operator/api/v1alpha1/runbook_types.go
index c482fd35..1ea8c161 100644
--- a/operator/api/v1alpha1/runbook_types.go
+++ b/operator/api/v1alpha1/runbook_types.go
@@ -72,7 +72,3 @@ type RunbookList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Runbook `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Runbook{}, &RunbookList{})
-}
diff --git a/operator/api/v1alpha1/slo_types.go b/operator/api/v1alpha1/slo_types.go
index a7ab4691..d4a9ec6e 100644
--- a/operator/api/v1alpha1/slo_types.go
+++ b/operator/api/v1alpha1/slo_types.go
@@ -199,7 +199,3 @@ type ServiceLevelObjectiveList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ServiceLevelObjective `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ServiceLevelObjective{}, &ServiceLevelObjectiveList{})
-}
diff --git a/operator/api/v1alpha1/sourcerepository_types.go b/operator/api/v1alpha1/sourcerepository_types.go
index 294473d3..6de49efc 100644
--- a/operator/api/v1alpha1/sourcerepository_types.go
+++ b/operator/api/v1alpha1/sourcerepository_types.go
@@ -139,7 +139,3 @@ type SourceRepositoryList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []SourceRepository `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&SourceRepository{}, &SourceRepositoryList{})
-}