diff --git a/controllers/argocd/custommapper_test.go b/controllers/argocd/custommapper_test.go
index 4b2fa9d4b..900163a3d 100644
--- a/controllers/argocd/custommapper_test.go
+++ b/controllers/argocd/custommapper_test.go
@@ -135,7 +135,7 @@ func TestArgoCDReconciler_tlsSecretMapperRepoServer(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
@@ -192,7 +192,7 @@ func TestArgoCDReconciler_tlsSecretMapperRepoServer(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
@@ -242,7 +242,7 @@ func TestArgoCDReconciler_tlsSecretMapperRepoServer(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
@@ -376,7 +376,7 @@ func TestArgoCDReconciler_tlsSecretMapperRedis(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
@@ -433,7 +433,7 @@ func TestArgoCDReconciler_tlsSecretMapperRedis(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
@@ -483,7 +483,7 @@ func TestArgoCDReconciler_tlsSecretMapperRedis(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
diff --git a/controllers/argocd/keycloak.go b/controllers/argocd/keycloak.go
index 5bcd2e918..8c12f6416 100644
--- a/controllers/argocd/keycloak.go
+++ b/controllers/argocd/keycloak.go
@@ -287,7 +287,7 @@ func getKeycloakDeploymentConfigTemplate(cr *argoproj.ArgoCD) *appsv1.Deployment
 			Namespace: ns,
 			OwnerReferences: []metav1.OwnerReference{
 				{
-					APIVersion: "argoproj.io/v1alpha1",
+					APIVersion: "argoproj.io/v1beta1",
 					UID:        cr.UID,
 					Name:       cr.Name,
 					Controller: &controllerRef,
diff --git a/controllers/argocd/secret_test.go b/controllers/argocd/secret_test.go
index 613b76189..5175f1da5 100644
--- a/controllers/argocd/secret_test.go
+++ b/controllers/argocd/secret_test.go
@@ -83,7 +83,7 @@ func Test_ArgoCDReconciler_ReconcileRepoTLSSecret(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
@@ -375,7 +375,7 @@ func Test_ArgoCDReconciler_ReconcileRedisTLSSecret(t *testing.T) {
 				Namespace: "argocd-operator",
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion: "argoproj.io/v1alpha1",
+						APIVersion: "argoproj.io/v1beta1",
 						Kind:       "ArgoCD",
 						Name:       "argocd",
 						UID:        argocd.GetUID(),
diff --git a/controllers/argocd/testing.go b/controllers/argocd/testing.go
index 4be074ab8..602f14b50 100644
--- a/controllers/argocd/testing.go
+++ b/controllers/argocd/testing.go
@@ -40,10 +40,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 
+=======
+	argoprojv1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
+>>>>>>> 5d6261d (code-refactoring: Replace ArgoCD v1alpha1 references with v1beta1 (#1003))
 	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 =======
 	argoprojv1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
@@ -92,7 +96,7 @@ func makeTestNs(opts ...namespaceOpt) *corev1.Namespace {
 func makeTestReconciler(t *testing.T, objs ...runtime.Object) *ArgoCDReconciler {
 	s := scheme.Scheme
 	assert.NoError(t, argoproj.AddToScheme(s))
-	assert.NoError(t, argoproj.AddToScheme(s))
+	assert.NoError(t, argoprojv1alpha1.AddToScheme(s))
 
 	cl := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
 	logger := ctrl.Log.WithName("test-logger")