diff --git a/controllers/secret_finalizer_gc_controller.go b/controllers/secret_finalizer_gc_controller.go
index 428cf7107..344797281 100644
--- a/controllers/secret_finalizer_gc_controller.go
+++ b/controllers/secret_finalizer_gc_controller.go
@@ -20,7 +20,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/aiven/aiven-operator/api/v1alpha1"
 )
@@ -52,10 +51,10 @@ func (c *SecretFinalizerGCController) SetupWithManager(mgr ctrl.Manager, hasDefa
 	})
 
 	// watch aiven CRDs to queue secret reconciliations
-	for i := range aivenManagedTypes {
+	for _, aivenManagedType := range aivenManagedTypes {
 		builder.Watches(
-			&source.Kind{Type: aivenManagedTypes[i]},
-			handler.EnqueueRequestsFromMapFunc(func(a client.Object) []reconcile.Request {
+			aivenManagedType,
+			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, a client.Object) []reconcile.Request {
 				ao := a.(v1alpha1.AivenManagedObject)
 				if auth := ao.AuthSecretRef(); auth != nil {
 					return []reconcile.Request{
diff --git a/main.go b/main.go
index 427e98446..febed1a8a 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/aiven/aiven-operator/api/v1alpha1"
 	"github.com/aiven/aiven-operator/controllers"
@@ -28,8 +29,6 @@ var (
 	setupLog = ctrl.Log.WithName("setup")
 )
 
-const port = 9443
-
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(v1alpha1.AddToScheme(scheme))
@@ -57,8 +56,7 @@ func main() {
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
-		MetricsBindAddress:     metricsAddr,
-		Port:                   port,
+		Metrics:                metricsserver.Options{BindAddress: metricsAddr},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "40db2fac.aiven.io",
diff --git a/tests/suite_test.go b/tests/suite_test.go
index 66f91993a..0b0fda6e8 100644
--- a/tests/suite_test.go
+++ b/tests/suite_test.go
@@ -110,12 +110,13 @@ func setupSuite() error {
 	}
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:             scheme.Scheme,
-		MetricsBindAddress: "0",
-		CertDir:            testEnv.WebhookInstallOptions.LocalServingCertDir,
-		Port:               testEnv.WebhookInstallOptions.LocalServingPort,
+		Scheme:  scheme.Scheme,
+		Metrics: metricsserver.Options{BindAddress: "0"},
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Port:    testEnv.WebhookInstallOptions.LocalServingPort,
+			CertDir: testEnv.WebhookInstallOptions.LocalServingCertDir,
+		}),
 	})
-
 	if err != nil {
 		return err
 	}