diff --git a/cmd/eventlistenersink/main.go b/cmd/eventlistenersink/main.go
index a570ed6a2..b3efc11e4 100644
--- a/cmd/eventlistenersink/main.go
+++ b/cmd/eventlistenersink/main.go
@@ -47,18 +47,10 @@ func main() {
 	dc = dynamicClientset.New(tekton.WithClient(dc))
 	ctx = context.WithValue(ctx, dynamicclient.Key{}, dc)
 
-	// Set up ctx with the set of things based on the
-	// dynamic client we've set up above.
-	ctx = injection.Dynamic.SetupDynamic(ctx)
-
 	sinkArgs, err := sink.GetArgs()
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	sinkClients, err := sink.ConfigureClients(ctx, cfg)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
 	recorder, err := sink.NewRecorder()
 	if err != nil {
 		log.Fatal(err.Error())
@@ -72,6 +64,11 @@ func main() {
 	if err := controller.StartInformers(ctx.Done(), informers...); err != nil {
 		log.Fatal("failed to start informers:", err)
 	}
+
+	sinkClients, err := sink.ConfigureClients(ctx, cfg)
+	if err != nil {
+		log.Fatal(err.Error())
+	}
 	ctx = ictx
 
 	evadapter.MainWithContext(ctx, EventListenerLogKey, adapter.NewEnvConfig, adapter.New(sinkArgs, sinkClients, recorder))
diff --git a/pkg/reconciler/metrics/injection.go b/pkg/reconciler/metrics/injection.go
index 32ce785c1..46e1285a3 100644
--- a/pkg/reconciler/metrics/injection.go
+++ b/pkg/reconciler/metrics/injection.go
@@ -33,12 +33,6 @@ import (
 func init() {
 	injection.Default.RegisterClient(func(ctx context.Context, _ *rest.Config) context.Context { return WithClient(ctx) })
 	injection.Default.RegisterInformer(WithInformer)
-
-	injection.Dynamic.RegisterDynamicClient(WithClient)
-	injection.Dynamic.RegisterDynamicInformer(func(ctx context.Context) context.Context {
-		ctx, _ = WithInformer(ctx)
-		return ctx
-	})
 }
 
 // RecorderKey is used for associating the Recorder inside the context.Context.
diff --git a/pkg/sink/cloudevent/cloudeventclient.go b/pkg/sink/cloudevent/cloudeventclient.go
index 786455a1e..1af824a93 100644
--- a/pkg/sink/cloudevent/cloudeventclient.go
+++ b/pkg/sink/cloudevent/cloudeventclient.go
@@ -30,7 +30,6 @@ func init() {
 	injection.Default.RegisterClient(func(ctx context.Context, _ *rest.Config) context.Context {
 		return withCloudEventClient(ctx)
 	})
-	injection.Dynamic.RegisterDynamicClient(withCloudEventClient)
 }
 
 // CECKey is used to associate the CloudEventClient inside the context.Context