diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index 292a3c01d..2af2ea9ff 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
 	@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
 
-GINKGO := $(GOBIN)/ginkgo-v2.20.2
+GINKGO := $(GOBIN)/ginkgo-v2.22.2
 $(GINKGO): $(BINGO_DIR)/ginkgo.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/ginkgo-v2.20.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.20.2 "github.com/onsi/ginkgo/v2/ginkgo"
+	@echo "(re)installing $(GOBIN)/ginkgo-v2.22.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.22.2 "github.com/onsi/ginkgo/v2/ginkgo"
 
 GORELEASER := $(GOBIN)/goreleaser-v1.26.2
 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod
@@ -35,9 +35,9 @@ $(GORELEASER): $(BINGO_DIR)/goreleaser.mod
 	@echo "(re)installing $(GOBIN)/goreleaser-v1.26.2"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser"
 
-PROTOC_GEN_GO_GRPC := $(GOBIN)/protoc-gen-go-grpc-v1.3.0
+PROTOC_GEN_GO_GRPC := $(GOBIN)/protoc-gen-go-grpc-v1.5.1
 $(PROTOC_GEN_GO_GRPC): $(BINGO_DIR)/protoc-gen-go-grpc.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/protoc-gen-go-grpc-v1.3.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=protoc-gen-go-grpc.mod -o=$(GOBIN)/protoc-gen-go-grpc-v1.3.0 "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
+	@echo "(re)installing $(GOBIN)/protoc-gen-go-grpc-v1.5.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=protoc-gen-go-grpc.mod -o=$(GOBIN)/protoc-gen-go-grpc-v1.5.1 "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
 
diff --git a/.bingo/ginkgo.mod b/.bingo/ginkgo.mod
index 885d99791..c1e0852df 100644
--- a/.bingo/ginkgo.mod
+++ b/.bingo/ginkgo.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.22.2
 
-require github.com/onsi/ginkgo/v2 v2.20.2 // ginkgo
+require github.com/onsi/ginkgo/v2 v2.22.2 // ginkgo
diff --git a/.bingo/ginkgo.sum b/.bingo/ginkgo.sum
index 281f02732..e2123cdc6 100644
--- a/.bingo/ginkgo.sum
+++ b/.bingo/ginkgo.sum
@@ -26,6 +26,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
 github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -37,6 +39,8 @@ github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
 github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
+github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
+github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
@@ -79,6 +83,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e h1:4nW4NLDYnU28ojHaHO8OVxF
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
 golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
+golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/.bingo/protoc-gen-go-grpc.mod b/.bingo/protoc-gen-go-grpc.mod
index 51b100833..6d0d141a4 100644
--- a/.bingo/protoc-gen-go-grpc.mod
+++ b/.bingo/protoc-gen-go-grpc.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.22.2
 
-require google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
+require google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
diff --git a/.bingo/variables.env b/.bingo/variables.env
index d09a89bae..1d0ecefd3 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -10,9 +10,9 @@ fi
 
 BINGO="${GOBIN}/bingo-v0.9.0"
 
-GINKGO="${GOBIN}/ginkgo-v2.20.2"
+GINKGO="${GOBIN}/ginkgo-v2.22.2"
 
 GORELEASER="${GOBIN}/goreleaser-v1.26.2"
 
-PROTOC_GEN_GO_GRPC="${GOBIN}/protoc-gen-go-grpc-v1.3.0"
+PROTOC_GEN_GO_GRPC="${GOBIN}/protoc-gen-go-grpc-v1.5.1"
 
diff --git a/go.mod b/go.mod
index d735f7599..955739261 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/operator-framework/operator-registry
 
-go 1.22.7
+go 1.23.0
 
-toolchain go1.22.9
+toolchain go1.23.4
 
 require (
 	github.com/akrylysov/pogreb v0.10.2
diff --git a/pkg/api/registry_grpc.pb.go b/pkg/api/registry_grpc.pb.go
index b5a62b3df..6cbe685f8 100644
--- a/pkg/api/registry_grpc.pb.go
+++ b/pkg/api/registry_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.3.0
+// - protoc-gen-go-grpc v1.5.1
 // - protoc             v5.27.0
 // source: registry.proto
 
@@ -15,8 +15,8 @@ import (
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
+// Requires gRPC-Go v1.64.0 or later.
+const _ = grpc.SupportPackageIsVersion9
 
 const (
 	Registry_ListPackages_FullMethodName                       = "/api.Registry/ListPackages"
@@ -35,17 +35,17 @@ const (
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type RegistryClient interface {
-	ListPackages(ctx context.Context, in *ListPackageRequest, opts ...grpc.CallOption) (Registry_ListPackagesClient, error)
+	ListPackages(ctx context.Context, in *ListPackageRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[PackageName], error)
 	GetPackage(ctx context.Context, in *GetPackageRequest, opts ...grpc.CallOption) (*Package, error)
 	GetBundle(ctx context.Context, in *GetBundleRequest, opts ...grpc.CallOption) (*Bundle, error)
 	// Deprecated: Do not use.
 	GetBundleForChannel(ctx context.Context, in *GetBundleInChannelRequest, opts ...grpc.CallOption) (*Bundle, error)
-	GetChannelEntriesThatReplace(ctx context.Context, in *GetAllReplacementsRequest, opts ...grpc.CallOption) (Registry_GetChannelEntriesThatReplaceClient, error)
+	GetChannelEntriesThatReplace(ctx context.Context, in *GetAllReplacementsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ChannelEntry], error)
 	GetBundleThatReplaces(ctx context.Context, in *GetReplacementRequest, opts ...grpc.CallOption) (*Bundle, error)
-	GetChannelEntriesThatProvide(ctx context.Context, in *GetAllProvidersRequest, opts ...grpc.CallOption) (Registry_GetChannelEntriesThatProvideClient, error)
-	GetLatestChannelEntriesThatProvide(ctx context.Context, in *GetLatestProvidersRequest, opts ...grpc.CallOption) (Registry_GetLatestChannelEntriesThatProvideClient, error)
+	GetChannelEntriesThatProvide(ctx context.Context, in *GetAllProvidersRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ChannelEntry], error)
+	GetLatestChannelEntriesThatProvide(ctx context.Context, in *GetLatestProvidersRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ChannelEntry], error)
 	GetDefaultBundleThatProvides(ctx context.Context, in *GetDefaultProviderRequest, opts ...grpc.CallOption) (*Bundle, error)
-	ListBundles(ctx context.Context, in *ListBundlesRequest, opts ...grpc.CallOption) (Registry_ListBundlesClient, error)
+	ListBundles(ctx context.Context, in *ListBundlesRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Bundle], error)
 }
 
 type registryClient struct {
@@ -56,12 +56,13 @@ func NewRegistryClient(cc grpc.ClientConnInterface) RegistryClient {
 	return &registryClient{cc}
 }
 
-func (c *registryClient) ListPackages(ctx context.Context, in *ListPackageRequest, opts ...grpc.CallOption) (Registry_ListPackagesClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[0], Registry_ListPackages_FullMethodName, opts...)
+func (c *registryClient) ListPackages(ctx context.Context, in *ListPackageRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[PackageName], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[0], Registry_ListPackages_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &registryListPackagesClient{stream}
+	x := &grpc.GenericClientStream[ListPackageRequest, PackageName]{ClientStream: stream}
 	if err := x.ClientStream.SendMsg(in); err != nil {
 		return nil, err
 	}
@@ -71,26 +72,13 @@ func (c *registryClient) ListPackages(ctx context.Context, in *ListPackageReques
 	return x, nil
 }
 
-type Registry_ListPackagesClient interface {
-	Recv() (*PackageName, error)
-	grpc.ClientStream
-}
-
-type registryListPackagesClient struct {
-	grpc.ClientStream
-}
-
-func (x *registryListPackagesClient) Recv() (*PackageName, error) {
-	m := new(PackageName)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_ListPackagesClient = grpc.ServerStreamingClient[PackageName]
 
 func (c *registryClient) GetPackage(ctx context.Context, in *GetPackageRequest, opts ...grpc.CallOption) (*Package, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Package)
-	err := c.cc.Invoke(ctx, Registry_GetPackage_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Registry_GetPackage_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -98,8 +86,9 @@ func (c *registryClient) GetPackage(ctx context.Context, in *GetPackageRequest,
 }
 
 func (c *registryClient) GetBundle(ctx context.Context, in *GetBundleRequest, opts ...grpc.CallOption) (*Bundle, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Bundle)
-	err := c.cc.Invoke(ctx, Registry_GetBundle_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Registry_GetBundle_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -108,20 +97,22 @@ func (c *registryClient) GetBundle(ctx context.Context, in *GetBundleRequest, op
 
 // Deprecated: Do not use.
 func (c *registryClient) GetBundleForChannel(ctx context.Context, in *GetBundleInChannelRequest, opts ...grpc.CallOption) (*Bundle, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Bundle)
-	err := c.cc.Invoke(ctx, Registry_GetBundleForChannel_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Registry_GetBundleForChannel_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *registryClient) GetChannelEntriesThatReplace(ctx context.Context, in *GetAllReplacementsRequest, opts ...grpc.CallOption) (Registry_GetChannelEntriesThatReplaceClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[1], Registry_GetChannelEntriesThatReplace_FullMethodName, opts...)
+func (c *registryClient) GetChannelEntriesThatReplace(ctx context.Context, in *GetAllReplacementsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ChannelEntry], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[1], Registry_GetChannelEntriesThatReplace_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &registryGetChannelEntriesThatReplaceClient{stream}
+	x := &grpc.GenericClientStream[GetAllReplacementsRequest, ChannelEntry]{ClientStream: stream}
 	if err := x.ClientStream.SendMsg(in); err != nil {
 		return nil, err
 	}
@@ -131,38 +122,26 @@ func (c *registryClient) GetChannelEntriesThatReplace(ctx context.Context, in *G
 	return x, nil
 }
 
-type Registry_GetChannelEntriesThatReplaceClient interface {
-	Recv() (*ChannelEntry, error)
-	grpc.ClientStream
-}
-
-type registryGetChannelEntriesThatReplaceClient struct {
-	grpc.ClientStream
-}
-
-func (x *registryGetChannelEntriesThatReplaceClient) Recv() (*ChannelEntry, error) {
-	m := new(ChannelEntry)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_GetChannelEntriesThatReplaceClient = grpc.ServerStreamingClient[ChannelEntry]
 
 func (c *registryClient) GetBundleThatReplaces(ctx context.Context, in *GetReplacementRequest, opts ...grpc.CallOption) (*Bundle, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Bundle)
-	err := c.cc.Invoke(ctx, Registry_GetBundleThatReplaces_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Registry_GetBundleThatReplaces_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *registryClient) GetChannelEntriesThatProvide(ctx context.Context, in *GetAllProvidersRequest, opts ...grpc.CallOption) (Registry_GetChannelEntriesThatProvideClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[2], Registry_GetChannelEntriesThatProvide_FullMethodName, opts...)
+func (c *registryClient) GetChannelEntriesThatProvide(ctx context.Context, in *GetAllProvidersRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ChannelEntry], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[2], Registry_GetChannelEntriesThatProvide_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &registryGetChannelEntriesThatProvideClient{stream}
+	x := &grpc.GenericClientStream[GetAllProvidersRequest, ChannelEntry]{ClientStream: stream}
 	if err := x.ClientStream.SendMsg(in); err != nil {
 		return nil, err
 	}
@@ -172,29 +151,16 @@ func (c *registryClient) GetChannelEntriesThatProvide(ctx context.Context, in *G
 	return x, nil
 }
 
-type Registry_GetChannelEntriesThatProvideClient interface {
-	Recv() (*ChannelEntry, error)
-	grpc.ClientStream
-}
-
-type registryGetChannelEntriesThatProvideClient struct {
-	grpc.ClientStream
-}
-
-func (x *registryGetChannelEntriesThatProvideClient) Recv() (*ChannelEntry, error) {
-	m := new(ChannelEntry)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_GetChannelEntriesThatProvideClient = grpc.ServerStreamingClient[ChannelEntry]
 
-func (c *registryClient) GetLatestChannelEntriesThatProvide(ctx context.Context, in *GetLatestProvidersRequest, opts ...grpc.CallOption) (Registry_GetLatestChannelEntriesThatProvideClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[3], Registry_GetLatestChannelEntriesThatProvide_FullMethodName, opts...)
+func (c *registryClient) GetLatestChannelEntriesThatProvide(ctx context.Context, in *GetLatestProvidersRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ChannelEntry], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[3], Registry_GetLatestChannelEntriesThatProvide_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &registryGetLatestChannelEntriesThatProvideClient{stream}
+	x := &grpc.GenericClientStream[GetLatestProvidersRequest, ChannelEntry]{ClientStream: stream}
 	if err := x.ClientStream.SendMsg(in); err != nil {
 		return nil, err
 	}
@@ -204,38 +170,26 @@ func (c *registryClient) GetLatestChannelEntriesThatProvide(ctx context.Context,
 	return x, nil
 }
 
-type Registry_GetLatestChannelEntriesThatProvideClient interface {
-	Recv() (*ChannelEntry, error)
-	grpc.ClientStream
-}
-
-type registryGetLatestChannelEntriesThatProvideClient struct {
-	grpc.ClientStream
-}
-
-func (x *registryGetLatestChannelEntriesThatProvideClient) Recv() (*ChannelEntry, error) {
-	m := new(ChannelEntry)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_GetLatestChannelEntriesThatProvideClient = grpc.ServerStreamingClient[ChannelEntry]
 
 func (c *registryClient) GetDefaultBundleThatProvides(ctx context.Context, in *GetDefaultProviderRequest, opts ...grpc.CallOption) (*Bundle, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Bundle)
-	err := c.cc.Invoke(ctx, Registry_GetDefaultBundleThatProvides_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Registry_GetDefaultBundleThatProvides_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *registryClient) ListBundles(ctx context.Context, in *ListBundlesRequest, opts ...grpc.CallOption) (Registry_ListBundlesClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[4], Registry_ListBundles_FullMethodName, opts...)
+func (c *registryClient) ListBundles(ctx context.Context, in *ListBundlesRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Bundle], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Registry_ServiceDesc.Streams[4], Registry_ListBundles_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &registryListBundlesClient{stream}
+	x := &grpc.GenericClientStream[ListBundlesRequest, Bundle]{ClientStream: stream}
 	if err := x.ClientStream.SendMsg(in); err != nil {
 		return nil, err
 	}
@@ -245,46 +199,35 @@ func (c *registryClient) ListBundles(ctx context.Context, in *ListBundlesRequest
 	return x, nil
 }
 
-type Registry_ListBundlesClient interface {
-	Recv() (*Bundle, error)
-	grpc.ClientStream
-}
-
-type registryListBundlesClient struct {
-	grpc.ClientStream
-}
-
-func (x *registryListBundlesClient) Recv() (*Bundle, error) {
-	m := new(Bundle)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_ListBundlesClient = grpc.ServerStreamingClient[Bundle]
 
 // RegistryServer is the server API for Registry service.
 // All implementations must embed UnimplementedRegistryServer
-// for forward compatibility
+// for forward compatibility.
 type RegistryServer interface {
-	ListPackages(*ListPackageRequest, Registry_ListPackagesServer) error
+	ListPackages(*ListPackageRequest, grpc.ServerStreamingServer[PackageName]) error
 	GetPackage(context.Context, *GetPackageRequest) (*Package, error)
 	GetBundle(context.Context, *GetBundleRequest) (*Bundle, error)
 	// Deprecated: Do not use.
 	GetBundleForChannel(context.Context, *GetBundleInChannelRequest) (*Bundle, error)
-	GetChannelEntriesThatReplace(*GetAllReplacementsRequest, Registry_GetChannelEntriesThatReplaceServer) error
+	GetChannelEntriesThatReplace(*GetAllReplacementsRequest, grpc.ServerStreamingServer[ChannelEntry]) error
 	GetBundleThatReplaces(context.Context, *GetReplacementRequest) (*Bundle, error)
-	GetChannelEntriesThatProvide(*GetAllProvidersRequest, Registry_GetChannelEntriesThatProvideServer) error
-	GetLatestChannelEntriesThatProvide(*GetLatestProvidersRequest, Registry_GetLatestChannelEntriesThatProvideServer) error
+	GetChannelEntriesThatProvide(*GetAllProvidersRequest, grpc.ServerStreamingServer[ChannelEntry]) error
+	GetLatestChannelEntriesThatProvide(*GetLatestProvidersRequest, grpc.ServerStreamingServer[ChannelEntry]) error
 	GetDefaultBundleThatProvides(context.Context, *GetDefaultProviderRequest) (*Bundle, error)
-	ListBundles(*ListBundlesRequest, Registry_ListBundlesServer) error
+	ListBundles(*ListBundlesRequest, grpc.ServerStreamingServer[Bundle]) error
 	mustEmbedUnimplementedRegistryServer()
 }
 
-// UnimplementedRegistryServer must be embedded to have forward compatible implementations.
-type UnimplementedRegistryServer struct {
-}
+// UnimplementedRegistryServer must be embedded to have
+// forward compatible implementations.
+//
+// NOTE: this should be embedded by value instead of pointer to avoid a nil
+// pointer dereference when methods are called.
+type UnimplementedRegistryServer struct{}
 
-func (UnimplementedRegistryServer) ListPackages(*ListPackageRequest, Registry_ListPackagesServer) error {
+func (UnimplementedRegistryServer) ListPackages(*ListPackageRequest, grpc.ServerStreamingServer[PackageName]) error {
 	return status.Errorf(codes.Unimplemented, "method ListPackages not implemented")
 }
 func (UnimplementedRegistryServer) GetPackage(context.Context, *GetPackageRequest) (*Package, error) {
@@ -296,25 +239,26 @@ func (UnimplementedRegistryServer) GetBundle(context.Context, *GetBundleRequest)
 func (UnimplementedRegistryServer) GetBundleForChannel(context.Context, *GetBundleInChannelRequest) (*Bundle, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetBundleForChannel not implemented")
 }
-func (UnimplementedRegistryServer) GetChannelEntriesThatReplace(*GetAllReplacementsRequest, Registry_GetChannelEntriesThatReplaceServer) error {
+func (UnimplementedRegistryServer) GetChannelEntriesThatReplace(*GetAllReplacementsRequest, grpc.ServerStreamingServer[ChannelEntry]) error {
 	return status.Errorf(codes.Unimplemented, "method GetChannelEntriesThatReplace not implemented")
 }
 func (UnimplementedRegistryServer) GetBundleThatReplaces(context.Context, *GetReplacementRequest) (*Bundle, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetBundleThatReplaces not implemented")
 }
-func (UnimplementedRegistryServer) GetChannelEntriesThatProvide(*GetAllProvidersRequest, Registry_GetChannelEntriesThatProvideServer) error {
+func (UnimplementedRegistryServer) GetChannelEntriesThatProvide(*GetAllProvidersRequest, grpc.ServerStreamingServer[ChannelEntry]) error {
 	return status.Errorf(codes.Unimplemented, "method GetChannelEntriesThatProvide not implemented")
 }
-func (UnimplementedRegistryServer) GetLatestChannelEntriesThatProvide(*GetLatestProvidersRequest, Registry_GetLatestChannelEntriesThatProvideServer) error {
+func (UnimplementedRegistryServer) GetLatestChannelEntriesThatProvide(*GetLatestProvidersRequest, grpc.ServerStreamingServer[ChannelEntry]) error {
 	return status.Errorf(codes.Unimplemented, "method GetLatestChannelEntriesThatProvide not implemented")
 }
 func (UnimplementedRegistryServer) GetDefaultBundleThatProvides(context.Context, *GetDefaultProviderRequest) (*Bundle, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetDefaultBundleThatProvides not implemented")
 }
-func (UnimplementedRegistryServer) ListBundles(*ListBundlesRequest, Registry_ListBundlesServer) error {
+func (UnimplementedRegistryServer) ListBundles(*ListBundlesRequest, grpc.ServerStreamingServer[Bundle]) error {
 	return status.Errorf(codes.Unimplemented, "method ListBundles not implemented")
 }
 func (UnimplementedRegistryServer) mustEmbedUnimplementedRegistryServer() {}
+func (UnimplementedRegistryServer) testEmbeddedByValue()                  {}
 
 // UnsafeRegistryServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to RegistryServer will
@@ -324,6 +268,13 @@ type UnsafeRegistryServer interface {
 }
 
 func RegisterRegistryServer(s grpc.ServiceRegistrar, srv RegistryServer) {
+	// If the following call pancis, it indicates UnimplementedRegistryServer was
+	// embedded by pointer and is nil.  This will cause panics if an
+	// unimplemented method is ever invoked, so we test this at initialization
+	// time to prevent it from happening at runtime later due to I/O.
+	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
+		t.testEmbeddedByValue()
+	}
 	s.RegisterService(&Registry_ServiceDesc, srv)
 }
 
@@ -332,21 +283,11 @@ func _Registry_ListPackages_Handler(srv interface{}, stream grpc.ServerStream) e
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
-	return srv.(RegistryServer).ListPackages(m, &registryListPackagesServer{stream})
-}
-
-type Registry_ListPackagesServer interface {
-	Send(*PackageName) error
-	grpc.ServerStream
+	return srv.(RegistryServer).ListPackages(m, &grpc.GenericServerStream[ListPackageRequest, PackageName]{ServerStream: stream})
 }
 
-type registryListPackagesServer struct {
-	grpc.ServerStream
-}
-
-func (x *registryListPackagesServer) Send(m *PackageName) error {
-	return x.ServerStream.SendMsg(m)
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_ListPackagesServer = grpc.ServerStreamingServer[PackageName]
 
 func _Registry_GetPackage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetPackageRequest)
@@ -407,21 +348,11 @@ func _Registry_GetChannelEntriesThatReplace_Handler(srv interface{}, stream grpc
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
-	return srv.(RegistryServer).GetChannelEntriesThatReplace(m, &registryGetChannelEntriesThatReplaceServer{stream})
-}
-
-type Registry_GetChannelEntriesThatReplaceServer interface {
-	Send(*ChannelEntry) error
-	grpc.ServerStream
-}
-
-type registryGetChannelEntriesThatReplaceServer struct {
-	grpc.ServerStream
+	return srv.(RegistryServer).GetChannelEntriesThatReplace(m, &grpc.GenericServerStream[GetAllReplacementsRequest, ChannelEntry]{ServerStream: stream})
 }
 
-func (x *registryGetChannelEntriesThatReplaceServer) Send(m *ChannelEntry) error {
-	return x.ServerStream.SendMsg(m)
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_GetChannelEntriesThatReplaceServer = grpc.ServerStreamingServer[ChannelEntry]
 
 func _Registry_GetBundleThatReplaces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetReplacementRequest)
@@ -446,42 +377,22 @@ func _Registry_GetChannelEntriesThatProvide_Handler(srv interface{}, stream grpc
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
-	return srv.(RegistryServer).GetChannelEntriesThatProvide(m, &registryGetChannelEntriesThatProvideServer{stream})
+	return srv.(RegistryServer).GetChannelEntriesThatProvide(m, &grpc.GenericServerStream[GetAllProvidersRequest, ChannelEntry]{ServerStream: stream})
 }
 
-type Registry_GetChannelEntriesThatProvideServer interface {
-	Send(*ChannelEntry) error
-	grpc.ServerStream
-}
-
-type registryGetChannelEntriesThatProvideServer struct {
-	grpc.ServerStream
-}
-
-func (x *registryGetChannelEntriesThatProvideServer) Send(m *ChannelEntry) error {
-	return x.ServerStream.SendMsg(m)
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_GetChannelEntriesThatProvideServer = grpc.ServerStreamingServer[ChannelEntry]
 
 func _Registry_GetLatestChannelEntriesThatProvide_Handler(srv interface{}, stream grpc.ServerStream) error {
 	m := new(GetLatestProvidersRequest)
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
-	return srv.(RegistryServer).GetLatestChannelEntriesThatProvide(m, &registryGetLatestChannelEntriesThatProvideServer{stream})
-}
-
-type Registry_GetLatestChannelEntriesThatProvideServer interface {
-	Send(*ChannelEntry) error
-	grpc.ServerStream
+	return srv.(RegistryServer).GetLatestChannelEntriesThatProvide(m, &grpc.GenericServerStream[GetLatestProvidersRequest, ChannelEntry]{ServerStream: stream})
 }
 
-type registryGetLatestChannelEntriesThatProvideServer struct {
-	grpc.ServerStream
-}
-
-func (x *registryGetLatestChannelEntriesThatProvideServer) Send(m *ChannelEntry) error {
-	return x.ServerStream.SendMsg(m)
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_GetLatestChannelEntriesThatProvideServer = grpc.ServerStreamingServer[ChannelEntry]
 
 func _Registry_GetDefaultBundleThatProvides_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetDefaultProviderRequest)
@@ -506,21 +417,11 @@ func _Registry_ListBundles_Handler(srv interface{}, stream grpc.ServerStream) er
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
-	return srv.(RegistryServer).ListBundles(m, &registryListBundlesServer{stream})
-}
-
-type Registry_ListBundlesServer interface {
-	Send(*Bundle) error
-	grpc.ServerStream
+	return srv.(RegistryServer).ListBundles(m, &grpc.GenericServerStream[ListBundlesRequest, Bundle]{ServerStream: stream})
 }
 
-type registryListBundlesServer struct {
-	grpc.ServerStream
-}
-
-func (x *registryListBundlesServer) Send(m *Bundle) error {
-	return x.ServerStream.SendMsg(m)
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Registry_ListBundlesServer = grpc.ServerStreamingServer[Bundle]
 
 // Registry_ServiceDesc is the grpc.ServiceDesc for Registry service.
 // It's only intended for direct use with grpc.RegisterService,
diff --git a/pkg/containertools/containertoolsfakes/fake_command_runner.go b/pkg/containertools/containertoolsfakes/fake_command_runner.go
index 40ae4ddf9..4dd5f69b7 100644
--- a/pkg/containertools/containertoolsfakes/fake_command_runner.go
+++ b/pkg/containertools/containertoolsfakes/fake_command_runner.go
@@ -65,15 +65,16 @@ func (fake *FakeCommandRunner) Build(arg1 string, arg2 string) error {
 		arg1 string
 		arg2 string
 	}{arg1, arg2})
+	stub := fake.BuildStub
+	fakeReturns := fake.buildReturns
 	fake.recordInvocation("Build", []interface{}{arg1, arg2})
 	fake.buildMutex.Unlock()
-	if fake.BuildStub != nil {
-		return fake.BuildStub(arg1, arg2)
+	if stub != nil {
+		return stub(arg1, arg2)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.buildReturns
 	return fakeReturns.result1
 }
 
@@ -124,15 +125,16 @@ func (fake *FakeCommandRunner) GetToolName() string {
 	ret, specificReturn := fake.getToolNameReturnsOnCall[len(fake.getToolNameArgsForCall)]
 	fake.getToolNameArgsForCall = append(fake.getToolNameArgsForCall, struct {
 	}{})
+	stub := fake.GetToolNameStub
+	fakeReturns := fake.getToolNameReturns
 	fake.recordInvocation("GetToolName", []interface{}{})
 	fake.getToolNameMutex.Unlock()
-	if fake.GetToolNameStub != nil {
-		return fake.GetToolNameStub()
+	if stub != nil {
+		return stub()
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.getToolNameReturns
 	return fakeReturns.result1
 }
 
@@ -177,15 +179,16 @@ func (fake *FakeCommandRunner) Inspect(arg1 string) ([]byte, error) {
 	fake.inspectArgsForCall = append(fake.inspectArgsForCall, struct {
 		arg1 string
 	}{arg1})
+	stub := fake.InspectStub
+	fakeReturns := fake.inspectReturns
 	fake.recordInvocation("Inspect", []interface{}{arg1})
 	fake.inspectMutex.Unlock()
-	if fake.InspectStub != nil {
-		return fake.InspectStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1, ret.result2
 	}
-	fakeReturns := fake.inspectReturns
 	return fakeReturns.result1, fakeReturns.result2
 }
 
@@ -240,15 +243,16 @@ func (fake *FakeCommandRunner) Pull(arg1 string) error {
 	fake.pullArgsForCall = append(fake.pullArgsForCall, struct {
 		arg1 string
 	}{arg1})
+	stub := fake.PullStub
+	fakeReturns := fake.pullReturns
 	fake.recordInvocation("Pull", []interface{}{arg1})
 	fake.pullMutex.Unlock()
-	if fake.PullStub != nil {
-		return fake.PullStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.pullReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/containertools/containertoolsfakes/fake_dockerfile_generator.go b/pkg/containertools/containertoolsfakes/fake_dockerfile_generator.go
index 7f0aca60f..572bd97d9 100644
--- a/pkg/containertools/containertoolsfakes/fake_dockerfile_generator.go
+++ b/pkg/containertools/containertoolsfakes/fake_dockerfile_generator.go
@@ -31,15 +31,16 @@ func (fake *FakeDockerfileGenerator) GenerateIndexDockerfile(arg1 string, arg2 s
 		arg1 string
 		arg2 string
 	}{arg1, arg2})
+	stub := fake.GenerateIndexDockerfileStub
+	fakeReturns := fake.generateIndexDockerfileReturns
 	fake.recordInvocation("GenerateIndexDockerfile", []interface{}{arg1, arg2})
 	fake.generateIndexDockerfileMutex.Unlock()
-	if fake.GenerateIndexDockerfileStub != nil {
-		return fake.GenerateIndexDockerfileStub(arg1, arg2)
+	if stub != nil {
+		return stub(arg1, arg2)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.generateIndexDockerfileReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/containertools/containertoolsfakes/fake_label_reader.go b/pkg/containertools/containertoolsfakes/fake_label_reader.go
index 07dfa0048..6a424a66e 100644
--- a/pkg/containertools/containertoolsfakes/fake_label_reader.go
+++ b/pkg/containertools/containertoolsfakes/fake_label_reader.go
@@ -31,15 +31,16 @@ func (fake *FakeLabelReader) GetLabelsFromImage(arg1 string) (map[string]string,
 	fake.getLabelsFromImageArgsForCall = append(fake.getLabelsFromImageArgsForCall, struct {
 		arg1 string
 	}{arg1})
+	stub := fake.GetLabelsFromImageStub
+	fakeReturns := fake.getLabelsFromImageReturns
 	fake.recordInvocation("GetLabelsFromImage", []interface{}{arg1})
 	fake.getLabelsFromImageMutex.Unlock()
-	if fake.GetLabelsFromImageStub != nil {
-		return fake.GetLabelsFromImageStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1, ret.result2
 	}
-	fakeReturns := fake.getLabelsFromImageReturns
 	return fakeReturns.result1, fakeReturns.result2
 }
 
diff --git a/pkg/lib/indexer/indexerfakes/fake_index_adder.go b/pkg/lib/indexer/indexerfakes/fake_index_adder.go
index eff58d0e5..8e9a3b1a7 100644
--- a/pkg/lib/indexer/indexerfakes/fake_index_adder.go
+++ b/pkg/lib/indexer/indexerfakes/fake_index_adder.go
@@ -29,15 +29,16 @@ func (fake *FakeIndexAdder) AddToIndex(arg1 indexer.AddToIndexRequest) error {
 	fake.addToIndexArgsForCall = append(fake.addToIndexArgsForCall, struct {
 		arg1 indexer.AddToIndexRequest
 	}{arg1})
+	stub := fake.AddToIndexStub
+	fakeReturns := fake.addToIndexReturns
 	fake.recordInvocation("AddToIndex", []interface{}{arg1})
 	fake.addToIndexMutex.Unlock()
-	if fake.AddToIndexStub != nil {
-		return fake.AddToIndexStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.addToIndexReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/lib/indexer/indexerfakes/fake_index_deleter.go b/pkg/lib/indexer/indexerfakes/fake_index_deleter.go
index 7daaa618f..5d70b904d 100644
--- a/pkg/lib/indexer/indexerfakes/fake_index_deleter.go
+++ b/pkg/lib/indexer/indexerfakes/fake_index_deleter.go
@@ -29,15 +29,16 @@ func (fake *FakeIndexDeleter) DeleteFromIndex(arg1 indexer.DeleteFromIndexReques
 	fake.deleteFromIndexArgsForCall = append(fake.deleteFromIndexArgsForCall, struct {
 		arg1 indexer.DeleteFromIndexRequest
 	}{arg1})
+	stub := fake.DeleteFromIndexStub
+	fakeReturns := fake.deleteFromIndexReturns
 	fake.recordInvocation("DeleteFromIndex", []interface{}{arg1})
 	fake.deleteFromIndexMutex.Unlock()
-	if fake.DeleteFromIndexStub != nil {
-		return fake.DeleteFromIndexStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.deleteFromIndexReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/lib/indexer/indexerfakes/fake_index_exporter.go b/pkg/lib/indexer/indexerfakes/fake_index_exporter.go
index e58b65b7a..ce1a3af8c 100644
--- a/pkg/lib/indexer/indexerfakes/fake_index_exporter.go
+++ b/pkg/lib/indexer/indexerfakes/fake_index_exporter.go
@@ -29,15 +29,16 @@ func (fake *FakeIndexExporter) ExportFromIndex(arg1 indexer.ExportFromIndexReque
 	fake.exportFromIndexArgsForCall = append(fake.exportFromIndexArgsForCall, struct {
 		arg1 indexer.ExportFromIndexRequest
 	}{arg1})
+	stub := fake.ExportFromIndexStub
+	fakeReturns := fake.exportFromIndexReturns
 	fake.recordInvocation("ExportFromIndex", []interface{}{arg1})
 	fake.exportFromIndexMutex.Unlock()
-	if fake.ExportFromIndexStub != nil {
-		return fake.ExportFromIndexStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.exportFromIndexReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/lib/registry/registryfakes/fake_registry_adder.go b/pkg/lib/registry/registryfakes/fake_registry_adder.go
index 14a0df359..5c166adb7 100644
--- a/pkg/lib/registry/registryfakes/fake_registry_adder.go
+++ b/pkg/lib/registry/registryfakes/fake_registry_adder.go
@@ -29,15 +29,16 @@ func (fake *FakeRegistryAdder) AddToRegistry(arg1 registry.AddToRegistryRequest)
 	fake.addToRegistryArgsForCall = append(fake.addToRegistryArgsForCall, struct {
 		arg1 registry.AddToRegistryRequest
 	}{arg1})
+	stub := fake.AddToRegistryStub
+	fakeReturns := fake.addToRegistryReturns
 	fake.recordInvocation("AddToRegistry", []interface{}{arg1})
 	fake.addToRegistryMutex.Unlock()
-	if fake.AddToRegistryStub != nil {
-		return fake.AddToRegistryStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.addToRegistryReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/lib/registry/registryfakes/fake_registry_deleter.go b/pkg/lib/registry/registryfakes/fake_registry_deleter.go
index 554d11dd6..340346a0f 100644
--- a/pkg/lib/registry/registryfakes/fake_registry_deleter.go
+++ b/pkg/lib/registry/registryfakes/fake_registry_deleter.go
@@ -29,15 +29,16 @@ func (fake *FakeRegistryDeleter) DeleteFromRegistry(arg1 registry.DeleteFromRegi
 	fake.deleteFromRegistryArgsForCall = append(fake.deleteFromRegistryArgsForCall, struct {
 		arg1 registry.DeleteFromRegistryRequest
 	}{arg1})
+	stub := fake.DeleteFromRegistryStub
+	fakeReturns := fake.deleteFromRegistryReturns
 	fake.recordInvocation("DeleteFromRegistry", []interface{}{arg1})
 	fake.deleteFromRegistryMutex.Unlock()
-	if fake.DeleteFromRegistryStub != nil {
-		return fake.DeleteFromRegistryStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.deleteFromRegistryReturns
 	return fakeReturns.result1
 }
 
diff --git a/pkg/registry/registryfakes/fake_graph_loader.go b/pkg/registry/registryfakes/fake_graph_loader.go
index d76d4f37c..b11ccbb32 100644
--- a/pkg/registry/registryfakes/fake_graph_loader.go
+++ b/pkg/registry/registryfakes/fake_graph_loader.go
@@ -31,15 +31,16 @@ func (fake *FakeGraphLoader) Generate(arg1 string) (*registry.Package, error) {
 	fake.generateArgsForCall = append(fake.generateArgsForCall, struct {
 		arg1 string
 	}{arg1})
+	stub := fake.GenerateStub
+	fakeReturns := fake.generateReturns
 	fake.recordInvocation("Generate", []interface{}{arg1})
 	fake.generateMutex.Unlock()
-	if fake.GenerateStub != nil {
-		return fake.GenerateStub(arg1)
+	if stub != nil {
+		return stub(arg1)
 	}
 	if specificReturn {
 		return ret.result1, ret.result2
 	}
-	fakeReturns := fake.generateReturns
 	return fakeReturns.result1, fakeReturns.result2
 }
 
diff --git a/pkg/sqlite/sqlitefakes/fake_querier.go b/pkg/sqlite/sqlitefakes/fake_querier.go
index 8d5ebca06..aff65723c 100644
--- a/pkg/sqlite/sqlitefakes/fake_querier.go
+++ b/pkg/sqlite/sqlitefakes/fake_querier.go
@@ -36,15 +36,16 @@ func (fake *FakeQuerier) QueryContext(arg1 context.Context, arg2 string, arg3 ..
 		arg2 string
 		arg3 []interface{}
 	}{arg1, arg2, arg3})
+	stub := fake.QueryContextStub
+	fakeReturns := fake.queryContextReturns
 	fake.recordInvocation("QueryContext", []interface{}{arg1, arg2, arg3})
 	fake.queryContextMutex.Unlock()
-	if fake.QueryContextStub != nil {
-		return fake.QueryContextStub(arg1, arg2, arg3...)
+	if stub != nil {
+		return stub(arg1, arg2, arg3...)
 	}
 	if specificReturn {
 		return ret.result1, ret.result2
 	}
-	fakeReturns := fake.queryContextReturns
 	return fakeReturns.result1, fakeReturns.result2
 }
 
diff --git a/pkg/sqlite/sqlitefakes/fake_rowscanner.go b/pkg/sqlite/sqlitefakes/fake_rowscanner.go
index 3d0cb5b11..b5ffcc8dc 100644
--- a/pkg/sqlite/sqlitefakes/fake_rowscanner.go
+++ b/pkg/sqlite/sqlitefakes/fake_rowscanner.go
@@ -48,15 +48,16 @@ func (fake *FakeRowScanner) Close() error {
 	ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)]
 	fake.closeArgsForCall = append(fake.closeArgsForCall, struct {
 	}{})
+	stub := fake.CloseStub
+	fakeReturns := fake.closeReturns
 	fake.recordInvocation("Close", []interface{}{})
 	fake.closeMutex.Unlock()
-	if fake.CloseStub != nil {
-		return fake.CloseStub()
+	if stub != nil {
+		return stub()
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.closeReturns
 	return fakeReturns.result1
 }
 
@@ -100,15 +101,16 @@ func (fake *FakeRowScanner) Next() bool {
 	ret, specificReturn := fake.nextReturnsOnCall[len(fake.nextArgsForCall)]
 	fake.nextArgsForCall = append(fake.nextArgsForCall, struct {
 	}{})
+	stub := fake.NextStub
+	fakeReturns := fake.nextReturns
 	fake.recordInvocation("Next", []interface{}{})
 	fake.nextMutex.Unlock()
-	if fake.NextStub != nil {
-		return fake.NextStub()
+	if stub != nil {
+		return stub()
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.nextReturns
 	return fakeReturns.result1
 }
 
@@ -153,15 +155,16 @@ func (fake *FakeRowScanner) Scan(arg1 ...interface{}) error {
 	fake.scanArgsForCall = append(fake.scanArgsForCall, struct {
 		arg1 []interface{}
 	}{arg1})
+	stub := fake.ScanStub
+	fakeReturns := fake.scanReturns
 	fake.recordInvocation("Scan", []interface{}{arg1})
 	fake.scanMutex.Unlock()
-	if fake.ScanStub != nil {
-		return fake.ScanStub(arg1...)
+	if stub != nil {
+		return stub(arg1...)
 	}
 	if specificReturn {
 		return ret.result1
 	}
-	fakeReturns := fake.scanReturns
 	return fakeReturns.result1
 }