diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index a46a3588e..b71250c31 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -256,11 +256,15 @@ func main() {
 
 	cm := contentmanager.NewManager(clientRestConfigMapper, mgr.GetConfig(), mgr.GetRESTMapper())
 	contentManagerFinalizerKey := fmt.Sprintf("%s/contentmanager-cleanup", domain)
-	clusterExtensionFinalizers.Register(contentManagerFinalizerKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
+	err = clusterExtensionFinalizers.Register(contentManagerFinalizerKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
 		ext := obj.(*ocv1alpha1.ClusterExtension)
 		cm.Delete(ext)
 		return crfinalizer.Result{}, nil
 	}))
+	if err != nil {
+		setupLog.Error(err, "unable to register content manager cleanup finalizer")
+		os.Exit(1)
+	}
 
 	if err = (&controllers.ClusterExtensionReconciler{
 		Client:                cl,
diff --git a/internal/applier/helm.go b/internal/applier/helm.go
index dc6bcc7f2..f21eecf76 100644
--- a/internal/applier/helm.go
+++ b/internal/applier/helm.go
@@ -17,6 +17,7 @@ import (
 	"helm.sh/helm/v3/pkg/storage/driver"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	apimachyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
@@ -25,7 +26,6 @@ import (
 	"github.com/operator-framework/operator-controller/internal/rukpak/convert"
 	"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
 	"github.com/operator-framework/operator-controller/internal/rukpak/util"
-	apimachyaml "k8s.io/apimachinery/pkg/util/yaml"
 )
 
 const (
diff --git a/internal/contentmanager/contentmanager.go b/internal/contentmanager/contentmanager.go
index 3c8f85ac6..eae3274e9 100644
--- a/internal/contentmanager/contentmanager.go
+++ b/internal/contentmanager/contentmanager.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/dynamic/dynamicinformer"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -24,7 +25,6 @@ import (
 
 	"github.com/operator-framework/operator-controller/api/v1alpha1"
 	oclabels "github.com/operator-framework/operator-controller/internal/labels"
-	"k8s.io/client-go/dynamic/dynamicinformer"
 )
 
 // Manager is a utility to manage content caches belonging
@@ -97,7 +97,7 @@ func NewManager(rcm RestConfigMapper, cfg *rest.Config, mapper meta.RESTMapper,
 //   - IF a cache does not already exist, create one
 //   - IF a cache already exists, calculate the difference between sources that have already been created. Identify which new sources need to be created and which need to be stopped and removed.
 //   - Stop and remove any sources that need to be stopped and removed
-//   - Create new sources, filtering the content they recieve from the Kubernetes API server with the labels that should be set on content managed by the provided ClusterExtension
+//   - Create new sources, filtering the content they receive from the Kubernetes API server with the labels that should be set on content managed by the provided ClusterExtension
 //   - Update and set the cache with the newly created sources
 //
 // An error is returned in the following cases:
diff --git a/internal/contentmanager/dynamicsource.go b/internal/contentmanager/dynamicsource.go
index ca7be7bc6..ab2a9ff16 100644
--- a/internal/contentmanager/dynamicsource.go
+++ b/internal/contentmanager/dynamicsource.go
@@ -131,7 +131,7 @@ func (dis *DynamicInformerSource) Start(ctx context.Context, q workqueue.RateLim
 			dis.mu.Unlock()
 		})
 
-		wait.PollUntilContextCancel(informerCtx, time.Second, true, func(ctx context.Context) (bool, error) {
+		_ = wait.PollUntilContextCancel(informerCtx, time.Second, true, func(ctx context.Context) (bool, error) {
 			if sharedIndexInf.HasSynced() {
 				syncOnce()
 				return true, nil
diff --git a/internal/contentmanager/eventhandler.go b/internal/contentmanager/eventhandler.go
index 49886fe52..0e24b808f 100644
--- a/internal/contentmanager/eventhandler.go
+++ b/internal/contentmanager/eventhandler.go
@@ -46,7 +46,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
-
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )