diff --git a/cmd/api/main.go b/cmd/api/main.go
index 560ed318b..966dcf6c5 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -53,7 +53,6 @@ import (
 	_ "github.com/tektoncd/results/pkg/api/server/db/errors/postgres"
 
 	"github.com/golang-jwt/jwt/v4"
-	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
 	grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
@@ -293,7 +292,7 @@ func main() {
 
 	svrOpts := []grpc.ServerOption{
 		grpc.Creds(creds),
-		grpc_middleware.WithUnaryServerChain( //nolint:staticcheck // TODO: migrate to grpc.ChainUnaryInterceptor
+		grpc.ChainUnaryInterceptor(
 			// The grpc_ctxtags context updater should be before everything else
 			grpc_ctxtags.UnaryServerInterceptor(grpc_ctxtags.WithFieldExtractor(grpc_ctxtags.CodeGenRequestFieldExtractor)),
 			grpc_zap.UnaryServerInterceptor(grpcLogger, zapOpts...),
@@ -302,7 +301,7 @@ func main() {
 			fieldmask.UnaryServerInterceptor(f.Get(features.PartialResponse)),
 			recovery.UnaryServerInterceptor(recovery.WithRecoveryHandler(recoveryHandler)),
 		),
-		grpc_middleware.WithStreamServerChain( //nolint:staticcheck // TODO: migrate to grpc.ChainStreamInterceptor
+		grpc.ChainStreamInterceptor(
 			// The grpc_ctxtags context updater should be before everything else
 			grpc_ctxtags.StreamServerInterceptor(grpc_ctxtags.WithFieldExtractor(grpc_ctxtags.CodeGenRequestFieldExtractor)),
 			grpc_zap.StreamServerInterceptor(grpcLogger, zapOpts...),