diff --git a/README.md b/README.md
index 94eec56..d0c6c71 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ spec:
     secretRef:
       name: git-sync-secret
   interval: 10m
-  owner: Skarlso
+  owner: open-component-model
   provider: github
   existingRepositoryPolicy: adopt
 ```
diff --git a/config/samples/delivery_v1alpha1_sync.yaml b/config/samples/delivery_v1alpha1_sync.yaml
deleted file mode 100644
index 23d2088..0000000
--- a/config/samples/delivery_v1alpha1_sync.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: delivery.ocm.software/v1alpha1
-kind: Sync
-metadata:
-  name: git-sample
-  namespace: ocm-system
-spec:
-  branch: main
-  commitTemplate:
-    email: <email>
-    message: "Update made from git-controller"
-    name: Gergely Brautigam
-  interval: 10m0s
-  subPath: ./application/podinfo
-  snapshotRef:
-    name: ocm-test-snapshot
-  repositoryRef:
-    name: test-repositroy
diff --git a/config/samples/mpas_v1alpha1_repository.yaml b/config/samples/mpas_v1alpha1_repository.yaml
deleted file mode 100644
index d898eee..0000000
--- a/config/samples/mpas_v1alpha1_repository.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: mpas.ocm.software/v1alpha1
-kind: Repository
-metadata:
-  name: repository-sample
-spec:
-  credentials:
-    secretRef:
-      name: github-creds
-  owner: Skarlso
-  provider: github
-  repositoryName: new-repository-1
diff --git a/controllers/delivery/sync_controller.go b/controllers/delivery/sync_controller.go
index 9198e14..f054b80 100644
--- a/controllers/delivery/sync_controller.go
+++ b/controllers/delivery/sync_controller.go
@@ -185,7 +185,7 @@ func (r *SyncReconciler) reconcile(ctx context.Context, obj *v1alpha1.Sync) erro
 	if targetBranch == "" && obj.Spec.AutomaticPullRequestCreation {
 		targetBranch = fmt.Sprintf("branch-%d", time.Now().Unix())
 	} else if targetBranch == "" && !obj.Spec.AutomaticPullRequestCreation {
-		err := fmt.Errorf("branch cannot be empty if automatic pull request creation is not enabled")
+		err := errors.New("branch cannot be empty if automatic pull request creation is not enabled")
 		status.MarkNotReady(r.EventRecorder, obj, v1alpha1.GitRepositoryPushFailedReason, err.Error())
 
 		return err
diff --git a/controllers/delivery/sync_controller_test.go b/controllers/delivery/sync_controller_test.go
index 8259f14..95d4bb7 100644
--- a/controllers/delivery/sync_controller_test.go
+++ b/controllers/delivery/sync_controller_test.go
@@ -47,7 +47,7 @@ func TestSyncReconciler(t *testing.T) {
 		},
 		Spec: mpasv1alpha1.RepositorySpec{
 			Provider: "github",
-			Owner:    "Skarlso",
+			Owner:    "open-component-model",
 			Credentials: mpasv1alpha1.Credentials{
 				SecretRef: v1.LocalObjectReference{
 					Name: secret.Name,
@@ -72,7 +72,7 @@ func TestSyncReconciler(t *testing.T) {
 			},
 			CommitTemplate: v1alpha1.CommitTemplate{
 				TargetBranch: "main",
-				Name:         "Skarlso",
+				Name:         "open-component-model",
 				Email:        "email@mail.com",
 				Message:      "This is my message",
 			},
@@ -130,7 +130,7 @@ func TestSyncReconcilerIsSkippedIfDigestIsAlreadyPresent(t *testing.T) {
 			},
 			CommitTemplate: v1alpha1.CommitTemplate{
 				TargetBranch: "main",
-				Name:         "Skarlso",
+				Name:         "open-component-model",
 				Email:        "email@mail.com",
 				Message:      "This is my message",
 			},
@@ -192,7 +192,7 @@ func TestSyncReconcilerWithAutomaticPullRequest(t *testing.T) {
 		},
 		Spec: mpasv1alpha1.RepositorySpec{
 			Provider: "github",
-			Owner:    "Skarlso",
+			Owner:    "open-component-model",
 			Credentials: mpasv1alpha1.Credentials{
 				SecretRef: v1.LocalObjectReference{
 					Name: secret.Name,
@@ -222,7 +222,7 @@ func TestSyncReconcilerWithAutomaticPullRequest(t *testing.T) {
 			},
 			CommitTemplate: v1alpha1.CommitTemplate{
 				TargetBranch: "main",
-				Name:         "Skarlso",
+				Name:         "open-component-model",
 				Email:        "email@mail.com",
 				Message:      "This is my message",
 			},