diff --git a/scaffold/templates/examples/sample.yaml.tpl b/scaffold/templates/examples/sample.yaml.tpl
index deabcd2b..31744ccf 100644
--- a/scaffold/templates/examples/sample.yaml.tpl
+++ b/scaffold/templates/examples/sample.yaml.tpl
@@ -1,4 +1,4 @@
 apiVersion: {{ .groupName }}/{{ .groupVersion }}
 kind: {{ .kind }}
 metadata:
-  name: {{ .operatorName | splitList "." | first | trimSuffix "-cop" }}
+  name: sample
diff --git a/scaffold/templates/go.mod.tpl b/scaffold/templates/go.mod.tpl
index 332d374e..6160834d 100644
--- a/scaffold/templates/go.mod.tpl
+++ b/scaffold/templates/go.mod.tpl
@@ -16,7 +16,6 @@ require (
 	{{- else }}
 	github.com/sap/component-operator-runtime {{ .version }}
 	{{- end }}
-	k8s.io/apiextensions-apiserver {{ .kubernetesVersion }}
 	k8s.io/apimachinery {{ .kubernetesVersion }}
 	k8s.io/client-go {{ .kubernetesVersion }}
 	k8s.io/code-generator {{ .codeGeneratorVersion }}
diff --git a/scaffold/templates/main.go.tpl b/scaffold/templates/main.go.tpl
index 7b29d208..891b42f1 100644
--- a/scaffold/templates/main.go.tpl
+++ b/scaffold/templates/main.go.tpl
@@ -33,9 +33,7 @@ import (
 	"strconv"
 	{{- end }}
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
@@ -123,7 +121,7 @@ func main() {
 		Scheme: scheme,
 		Client: client.Options{
 			Cache: &client.CacheOptions{
-				DisableFor: append(operator.GetUncacheableTypes(), &apiextensionsv1.CustomResourceDefinition{}, &apiregistrationv1.APIService{}),
+				DisableFor: operator.GetUncacheableTypes(),
 			},
 		},
 		LeaderElection:                enableLeaderElection,
diff --git a/scaffold/templates/pkg/operator/operator.go.tpl b/scaffold/templates/pkg/operator/operator.go.tpl
index ac70c029..a954c96f 100644
--- a/scaffold/templates/pkg/operator/operator.go.tpl
+++ b/scaffold/templates/pkg/operator/operator.go.tpl
@@ -23,8 +23,8 @@ package operator
 
 import (
 	"flag"
+	"fmt"
 
-	legacyerrors "github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -114,7 +114,7 @@ func (o *Operator) Setup(mgr ctrl.Manager) error {
 	// Replace this by a real resource generator (e.g. HelmGenerator or KustomizeGenerator, or your own one).
 	resourceGenerator, err := manifests.NewDummyGenerator()
 	if err != nil {
-		return legacyerrors.Wrap(err, "error initializing resource generator")
+		return fmt.Errorf("error initializing resource generator: %w", err)
 	}
 
 	if err := component.NewReconciler[*operator{{ .groupVersion }}.{{ .kind }}](
@@ -122,7 +122,7 @@ func (o *Operator) Setup(mgr ctrl.Manager) error {
 		resourceGenerator,
 		component.ReconcilerOptions{},
 	).SetupWithManager(mgr); err != nil {
-		return legacyerrors.Wrapf(err, "unable to create controller")
+		return fmt.Errorf("unable to create controller: %w", err)
 	}
 
 	{{- if or .validatingWebhookEnabled .mutatingWebhookEnabled }}