Merge branch 'pks-gitaly-service-dependencies' into 'master'

service: Simplify injection of dependencies for servers

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6377

Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Reviewed-by: James Liu <jliu@gitlab.com>
Reviewed-by: karthik nayak <knayak@gitlab.com>

44 files changed, 201 insertions, 789 deletions

diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go
index ead3f1a7b..1503e7077 100644
--- a/cmd/gitaly-hooks/hooks_test.go
+++ b/cmd/gitaly-hooks/hooks_test.go
@@ -863,13 +863,7 @@ func runHookServiceWithGitlabClient(t *testing.T, cfg config.Cfg, assertUserDeta
 		gitalypb.RegisterHookServiceServer(srv, baggageAsserter{
 			t:                 t,
 			assertUserDetails: assertUserDetails,
-			wrapped: hook.NewServer(
-				deps.GetHookManager(),
-				deps.GetLocator(),
-				deps.GetGitCmdFactory(),
-				deps.GetPackObjectsCache(),
-				deps.GetPackObjectsLimiter(),
-			),
+			wrapped:           hook.NewServer(deps),
 		})
 	}, append(serverOpts, testserver.WithGitLabClient(gitlabClient))...)
 }
diff --git a/internal/git/localrepo/remote_extra_test.go b/internal/git/localrepo/remote_extra_test.go
index 4e4f693ce..0efb3cea7 100644
--- a/internal/git/localrepo/remote_extra_test.go
+++ b/internal/git/localrepo/remote_extra_test.go
@@ -29,30 +29,9 @@ func TestRepo_FetchInternal(t *testing.T) {
 	protocolDetectingFactory := gittest.NewProtocolDetectingCommandFactory(t, ctx, cfg)
 
 	cfg.SocketPath = testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hook.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hook.NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	}, testserver.WithGitCommandFactory(protocolDetectingFactory))
 
 	testcfg.BuildGitalySSH(t, cfg)
diff --git a/internal/git/remoterepo/testhelper_test.go b/internal/git/remoterepo/testhelper_test.go
index 2a9b0ce9b..dd3e458b7 100644
--- a/internal/git/remoterepo/testhelper_test.go
+++ b/internal/git/remoterepo/testhelper_test.go
@@ -23,30 +23,9 @@ func setupGitalyServer(t *testing.T) config.Cfg {
 	cfg := testcfg.Build(t)
 
 	cfg.SocketPath = testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterRefServiceServer(srv, ref.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			deps.GetCatfileCache(),
-		))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(deps))
+		gitalypb.RegisterRefServiceServer(srv, ref.NewServer(deps))
 	})
 
 	return cfg
diff --git a/internal/gitaly/hook/updateref/update_with_hooks_test.go b/internal/gitaly/hook/updateref/update_with_hooks_test.go
index 629818778..45306cde1 100644
--- a/internal/gitaly/hook/updateref/update_with_hooks_test.go
+++ b/internal/gitaly/hook/updateref/update_with_hooks_test.go
@@ -98,13 +98,7 @@ func TestUpdaterWithHooks_UpdateReference(t *testing.T) {
 	// We need to set up a separate "real" hook service here, as it will be used in
 	// git-update-ref(1) spawned by `updateRefWithHooks()`
 	testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
 	})
 
 	repo, repoPath := gittest.CreateRepository(t, ctx, cfg, gittest.CreateRepositoryConfig{
diff --git a/internal/gitaly/service/blob/server.go b/internal/gitaly/service/blob/server.go
index 8e31fdbb6..c76bbd917 100644
--- a/internal/gitaly/service/blob/server.go
+++ b/internal/gitaly/service/blob/server.go
@@ -4,6 +4,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
@@ -16,11 +17,11 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc BlobServer
-func NewServer(locator storage.Locator, gitCmdFactory git.CommandFactory, catfileCache catfile.Cache) gitalypb.BlobServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.BlobServiceServer {
 	return &server{
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
 	}
 }
 
diff --git a/internal/gitaly/service/blob/testhelper_test.go b/internal/gitaly/service/blob/testhelper_test.go
index 4ca1a85ae..dab65e125 100644
--- a/internal/gitaly/service/blob/testhelper_test.go
+++ b/internal/gitaly/service/blob/testhelper_test.go
@@ -24,23 +24,8 @@ func setup(tb testing.TB, ctx context.Context) (config.Cfg, gitalypb.BlobService
 	cfg := testcfg.Build(tb)
 
 	addr := testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterBlobServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterBlobServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	})
 	cfg.SocketPath = addr
 
diff --git a/internal/gitaly/service/cleanup/server.go b/internal/gitaly/service/cleanup/server.go
index 0d4758cef..b1b488696 100644
--- a/internal/gitaly/service/cleanup/server.go
+++ b/internal/gitaly/service/cleanup/server.go
@@ -4,6 +4,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
@@ -16,11 +17,11 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc CleanupServer
-func NewServer(locator storage.Locator, gitCmdFactory git.CommandFactory, catfileCache catfile.Cache) gitalypb.CleanupServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.CleanupServiceServer {
 	return &server{
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
 	}
 }
 
diff --git a/internal/gitaly/service/cleanup/testhelper_test.go b/internal/gitaly/service/cleanup/testhelper_test.go
index 00f7a107a..3f488eba8 100644
--- a/internal/gitaly/service/cleanup/testhelper_test.go
+++ b/internal/gitaly/service/cleanup/testhelper_test.go
@@ -35,30 +35,9 @@ func setupCleanupService(t *testing.T, ctx context.Context) (config.Cfg, *gitaly
 
 func runCleanupServiceServer(t *testing.T, cfg config.Cfg) string {
 	return testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterCleanupServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterCleanupServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	})
 }
 
diff --git a/internal/gitaly/service/commit/server.go b/internal/gitaly/service/commit/server.go
index 4d1a70268..a2465f537 100644
--- a/internal/gitaly/service/commit/server.go
+++ b/internal/gitaly/service/commit/server.go
@@ -5,6 +5,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
@@ -18,17 +19,12 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc CommitServiceServer
-func NewServer(
-	cfg config.Cfg,
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	catfileCache catfile.Cache,
-) gitalypb.CommitServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.CommitServiceServer {
 	return &server{
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
-		cfg:           cfg,
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
+		cfg:           deps.GetCfg(),
 	}
 }
 
diff --git a/internal/gitaly/service/commit/testhelper_test.go b/internal/gitaly/service/commit/testhelper_test.go
index 44356057a..654861279 100644
--- a/internal/gitaly/service/commit/testhelper_test.go
+++ b/internal/gitaly/service/commit/testhelper_test.go
@@ -40,24 +40,8 @@ func setupCommitService(
 func startTestServices(tb testing.TB, cfg config.Cfg, opts ...testserver.GitalyServerOpt) string {
 	tb.Helper()
 	return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterCommitServiceServer(srv, NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterCommitServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	}, opts...)
 }
 
diff --git a/internal/gitaly/service/conflicts/server.go b/internal/gitaly/service/conflicts/server.go
index 4490bf97a..1dfbdbf3f 100644
--- a/internal/gitaly/service/conflicts/server.go
+++ b/internal/gitaly/service/conflicts/server.go
@@ -9,6 +9,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
@@ -26,21 +27,14 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc ConflictsServer
-func NewServer(
-	hookManager hook.Manager,
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	catfileCache catfile.Cache,
-	connsPool *client.Pool,
-	updater *updateref.UpdaterWithHooks,
-) gitalypb.ConflictsServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.ConflictsServiceServer {
 	return &server{
-		hookManager:   hookManager,
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
-		pool:          connsPool,
-		updater:       updater,
+		hookManager:   deps.GetHookManager(),
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
+		pool:          deps.GetConnsPool(),
+		updater:       deps.GetUpdaterWithHooks(),
 	}
 }
 
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go
index 1d1b2f6e8..382c2f39a 100644
--- a/internal/gitaly/service/conflicts/testhelper_test.go
+++ b/internal/gitaly/service/conflicts/testhelper_test.go
@@ -36,44 +36,11 @@ func setupConflictsService(tb testing.TB, hookManager hook.Manager) (config.Cfg,
 
 func runConflictsServer(tb testing.TB, cfg config.Cfg, hookManager hook.Manager) string {
 	return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterConflictsServiceServer(srv, NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetUpdaterWithHooks(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
+		gitalypb.RegisterConflictsServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
+		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(deps))
 	}, testserver.WithHookManager(hookManager))
 }
 
diff --git a/internal/gitaly/service/diff/server.go b/internal/gitaly/service/diff/server.go
index c54640cf2..156da0f56 100644
--- a/internal/gitaly/service/diff/server.go
+++ b/internal/gitaly/service/diff/server.go
@@ -4,6 +4,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
@@ -19,12 +20,12 @@ type server struct {
 }
 
 // NewServer creates a new instance of a gRPC DiffServer
-func NewServer(locator storage.Locator, gitCmdFactory git.CommandFactory, catfileCache catfile.Cache) gitalypb.DiffServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.DiffServiceServer {
 	return &server{
 		MsgSizeThreshold: msgSizeThreshold,
-		locator:          locator,
-		gitCmdFactory:    gitCmdFactory,
-		catfileCache:     catfileCache,
+		locator:          deps.GetLocator(),
+		gitCmdFactory:    deps.GetGitCmdFactory(),
+		catfileCache:     deps.GetCatfileCache(),
 	}
 }
 
diff --git a/internal/gitaly/service/diff/testhelper_test.go b/internal/gitaly/service/diff/testhelper_test.go
index 4bde0b629..7aa383966 100644
--- a/internal/gitaly/service/diff/testhelper_test.go
+++ b/internal/gitaly/service/diff/testhelper_test.go
@@ -23,23 +23,8 @@ func setupDiffService(tb testing.TB, opt ...testserver.GitalyServerOpt) (config.
 	cfg := testcfg.Build(tb)
 
 	addr := testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterDiffServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterDiffServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	}, opt...)
 	cfg.SocketPath = addr
 
diff --git a/internal/gitaly/service/hook/server.go b/internal/gitaly/service/hook/server.go
index d99f66aa9..3d2977616 100644
--- a/internal/gitaly/service/hook/server.go
+++ b/internal/gitaly/service/hook/server.go
@@ -6,6 +6,7 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/limiter"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/streamcache"
@@ -31,19 +32,13 @@ type server struct {
 }
 
 // NewServer creates a new instance of a gRPC namespace server
-func NewServer(
-	manager gitalyhook.Manager,
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	packObjectsCache streamcache.Cache,
-	packObjectsLimiter limiter.Limiter,
-) gitalypb.HookServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.HookServiceServer {
 	srv := &server{
-		manager:            manager,
-		locator:            locator,
-		gitCmdFactory:      gitCmdFactory,
-		packObjectsCache:   packObjectsCache,
-		packObjectsLimiter: packObjectsLimiter,
+		manager:            deps.GetHookManager(),
+		locator:            deps.GetLocator(),
+		gitCmdFactory:      deps.GetGitCmdFactory(),
+		packObjectsCache:   deps.GetPackObjectsCache(),
+		packObjectsLimiter: deps.GetPackObjectsLimiter(),
 		runPackObjectsFn:   runPackObjects,
 	}
 
diff --git a/internal/gitaly/service/hook/testhelper_test.go b/internal/gitaly/service/hook/testhelper_test.go
index 95c2de53e..f55cbea57 100644
--- a/internal/gitaly/service/hook/testhelper_test.go
+++ b/internal/gitaly/service/hook/testhelper_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
-	gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
@@ -54,30 +53,13 @@ func runHooksServer(tb testing.TB, cfg config.Cfg, opts []serverOption, serverOp
 	serverOpts = append(serverOpts, testserver.WithDisablePraefect())
 
 	return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		hookServer := NewServer(
-			gitalyhook.NewManager(deps.GetCfg(), deps.GetLocator(), deps.GetGitCmdFactory(), deps.GetTxManager(), deps.GetGitlabClient()),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		)
+		hookServer := NewServer(deps)
 		for _, opt := range opts {
 			opt(hookServer.(*server))
 		}
 
 		gitalypb.RegisterHookServiceServer(srv, hookServer)
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	}, serverOpts...)
 }
 
diff --git a/internal/gitaly/service/internalgitaly/server.go b/internal/gitaly/service/internalgitaly/server.go
index c7799e5c6..c0fa429b2 100644
--- a/internal/gitaly/service/internalgitaly/server.go
+++ b/internal/gitaly/service/internalgitaly/server.go
@@ -2,6 +2,7 @@ package internalgitaly
 
 import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
@@ -13,12 +14,9 @@ type server struct {
 }
 
 // NewServer return an instance of the Gitaly service.
-func NewServer(
-	storages []config.Storage,
-	locator storage.Locator,
-) gitalypb.InternalGitalyServer {
+func NewServer(deps *service.Dependencies) gitalypb.InternalGitalyServer {
 	return &server{
-		storages: storages,
-		locator:  locator,
+		storages: deps.GetCfg().Storages,
+		locator:  deps.GetLocator(),
 	}
 }
diff --git a/internal/gitaly/service/internalgitaly/walkrepos_test.go b/internal/gitaly/service/internalgitaly/walkrepos_test.go
index 777368c2a..3335a7d48 100644
--- a/internal/gitaly/service/internalgitaly/walkrepos_test.go
+++ b/internal/gitaly/service/internalgitaly/walkrepos_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
@@ -75,10 +76,10 @@ func TestWalkRepos(t *testing.T) {
 	// stream that allows us to hook in to stream responses. We then delete 'b' when
 	// the first repo 'a' is being streamed to the client.
 	deleteOnce := sync.Once{}
-	srv := NewServer(
-		[]config.Storage{{Name: storageName, Path: storageRoot}},
-		config.NewLocator(cfg),
-	)
+	srv := NewServer(&service.Dependencies{
+		Cfg:            cfg,
+		StorageLocator: config.NewLocator(cfg),
+	})
 	wsrv := &serverWrapper{
 		srv,
 		func(r *gitalypb.WalkReposRequest, s gitalypb.InternalGitaly_WalkReposServer) error {
diff --git a/internal/gitaly/service/namespace/server.go b/internal/gitaly/service/namespace/server.go
index b0c31d6e6..1c2a2df68 100644
--- a/internal/gitaly/service/namespace/server.go
+++ b/internal/gitaly/service/namespace/server.go
@@ -1,6 +1,7 @@
 package namespace
 
 import (
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
@@ -11,6 +12,6 @@ type server struct {
 }
 
 // NewServer creates a new instance of a gRPC namespace server
-func NewServer(locator storage.Locator) gitalypb.NamespaceServiceServer {
-	return &server{locator: locator}
+func NewServer(deps *service.Dependencies) gitalypb.NamespaceServiceServer {
+	return &server{locator: deps.GetLocator()}
 }
diff --git a/internal/gitaly/service/namespace/testhelper_test.go b/internal/gitaly/service/namespace/testhelper_test.go
index 2d8bd9bb4..79b1a5a8d 100644
--- a/internal/gitaly/service/namespace/testhelper_test.go
+++ b/internal/gitaly/service/namespace/testhelper_test.go
@@ -23,7 +23,7 @@ func setupNamespaceService(tb testing.TB, opts ...testserver.GitalyServerOpt) (c
 	cfg := cfgBuilder.Build(tb)
 
 	addr := testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterNamespaceServiceServer(srv, NewServer(deps.GetLocator()))
+		gitalypb.RegisterNamespaceServiceServer(srv, NewServer(deps))
 	}, opts...)
 
 	conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
diff --git a/internal/gitaly/service/objectpool/server.go b/internal/gitaly/service/objectpool/server.go
index abdc8b870..3edb6916a 100644
--- a/internal/gitaly/service/objectpool/server.go
+++ b/internal/gitaly/service/objectpool/server.go
@@ -5,6 +5,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
@@ -22,21 +23,14 @@ type server struct {
 }
 
 // NewServer creates a new instance of a gRPC repo server
-func NewServer(
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	catfileCache catfile.Cache,
-	txManager transaction.Manager,
-	housekeepingManager housekeeping.Manager,
-	repositoryCounter *counter.RepositoryCounter,
-) gitalypb.ObjectPoolServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.ObjectPoolServiceServer {
 	return &server{
-		locator:             locator,
-		gitCmdFactory:       gitCmdFactory,
-		catfileCache:        catfileCache,
-		txManager:           txManager,
-		housekeepingManager: housekeepingManager,
-		repositoryCounter:   repositoryCounter,
+		locator:             deps.GetLocator(),
+		gitCmdFactory:       deps.GetGitCmdFactory(),
+		catfileCache:        deps.GetCatfileCache(),
+		txManager:           deps.GetTxManager(),
+		housekeepingManager: deps.GetHousekeepingManager(),
+		repositoryCounter:   deps.GetRepositoryCounter(),
 	}
 }
 
diff --git a/internal/gitaly/service/objectpool/testhelper_test.go b/internal/gitaly/service/objectpool/testhelper_test.go
index cb51df425..3310a3c45 100644
--- a/internal/gitaly/service/objectpool/testhelper_test.go
+++ b/internal/gitaly/service/objectpool/testhelper_test.go
@@ -63,33 +63,9 @@ func setupWithConfig(t *testing.T, ctx context.Context, cfg config.Cfg, opts ...
 
 func runObjectPoolServer(t *testing.T, cfg config.Cfg, locator storage.Locator, logger log.Logger, opts ...testserver.GitalyServerOpt) string {
 	return testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterObjectPoolServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetTxManager(),
-			deps.GetHousekeepingManager(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterObjectPoolServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	}, append(opts, testserver.WithLocator(locator), testserver.WithLogger(logger))...)
 }
 
diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go
index a3e09a5a7..e926b9b45 100644
--- a/internal/gitaly/service/operations/server.go
+++ b/internal/gitaly/service/operations/server.go
@@ -9,6 +9,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client"
@@ -30,25 +31,16 @@ type Server struct {
 }
 
 // NewServer creates a new instance of a grpc OperationServiceServer
-func NewServer(
-	hookManager hook.Manager,
-	txManager transaction.Manager,
-	locator storage.Locator,
-	conns *client.Pool,
-	gitCmdFactory git.CommandFactory,
-	catfileCache catfile.Cache,
-	updater *updateref.UpdaterWithHooks,
-	signingKey string,
-) *Server {
+func NewServer(deps *service.Dependencies) *Server {
 	return &Server{
-		hookManager:   hookManager,
-		txManager:     txManager,
-		locator:       locator,
-		conns:         conns,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
-		updater:       updater,
-		signingKey:    signingKey,
+		hookManager:   deps.GetHookManager(),
+		txManager:     deps.GetTxManager(),
+		locator:       deps.GetLocator(),
+		conns:         deps.GetConnsPool(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
+		updater:       deps.GetUpdaterWithHooks(),
+		signingKey:    deps.GetCfg().Git.SigningKey,
 	}
 }
 
diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go
index 8d0a04074..f2b11a0e3 100644
--- a/internal/gitaly/service/operations/testhelper_test.go
+++ b/internal/gitaly/service/operations/testhelper_test.go
@@ -79,54 +79,12 @@ func runOperationServiceServer(tb testing.TB, cfg config.Cfg, options ...testser
 	tb.Helper()
 
 	return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		operationServer := NewServer(
-			deps.GetHookManager(),
-			deps.GetTxManager(),
-			deps.GetLocator(),
-			deps.GetConnsPool(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetUpdaterWithHooks(),
-			deps.GetCfg().Git.SigningKey,
-		)
-
-		gitalypb.RegisterOperationServiceServer(srv, operationServer)
-		gitalypb.RegisterHookServiceServer(srv, hook.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterRefServiceServer(srv, ref.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-		))
+		gitalypb.RegisterOperationServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hook.NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+		gitalypb.RegisterRefServiceServer(srv, ref.NewServer(deps))
+		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(deps))
+		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(deps))
 	}, options...)
 }
 
diff --git a/internal/gitaly/service/operations/user_create_branch_test.go b/internal/gitaly/service/operations/user_create_branch_test.go
index c6e8aa854..964ab5239 100644
--- a/internal/gitaly/service/operations/user_create_branch_test.go
+++ b/internal/gitaly/service/operations/user_create_branch_test.go
@@ -123,23 +123,8 @@ func TestUserCreateBranch_transactions(t *testing.T) {
 
 	cfg.ListenAddr = "127.0.0.1:0" // runs gitaly on the TCP address
 	addr := testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterOperationServiceServer(srv, NewServer(
-			deps.GetHookManager(),
-			deps.GetTxManager(),
-			deps.GetLocator(),
-			deps.GetConnsPool(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetUpdaterWithHooks(),
-			deps.GetCfg().Git.SigningKey,
-		))
-		gitalypb.RegisterHookServiceServer(srv, hook.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
+		gitalypb.RegisterOperationServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hook.NewServer(deps))
 		// Praefect proxy execution disabled as praefect runs only on the UNIX socket, but
 		// the test requires a TCP listening address.
 	}, testserver.WithDisablePraefect())
diff --git a/internal/gitaly/service/operations/user_delete_branch_test.go b/internal/gitaly/service/operations/user_delete_branch_test.go
index e71780551..a34285953 100644
--- a/internal/gitaly/service/operations/user_delete_branch_test.go
+++ b/internal/gitaly/service/operations/user_delete_branch_test.go
@@ -446,16 +446,7 @@ func TestUserDeleteBranch_transaction(t *testing.T) {
 	transactionServer := &testTransactionServer{}
 
 	testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterOperationServiceServer(srv, NewServer(
-			deps.GetHookManager(),
-			deps.GetTxManager(),
-			deps.GetLocator(),
-			deps.GetConnsPool(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetUpdaterWithHooks(),
-			deps.GetCfg().Git.SigningKey,
-		))
+		gitalypb.RegisterOperationServiceServer(srv, NewServer(deps))
 	})
 
 	ctx, err := txinfo.InjectTransaction(ctx, 1, "node", true)
diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go
index 61fbcae3c..6ec7ead6a 100644
--- a/internal/gitaly/service/ref/delete_refs_test.go
+++ b/internal/gitaly/service/ref/delete_refs_test.go
@@ -105,31 +105,9 @@ func TestDeleteRefs_transaction(t *testing.T) {
 	txManager := transaction.NewTrackingManager()
 
 	addr := testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterRefServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
+		gitalypb.RegisterRefServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
 	}, testserver.WithTransactionManager(txManager))
 	cfg.SocketPath = addr
 
diff --git a/internal/gitaly/service/ref/server.go b/internal/gitaly/service/ref/server.go
index 552ddfefb..e20d2cd62 100644
--- a/internal/gitaly/service/ref/server.go
+++ b/internal/gitaly/service/ref/server.go
@@ -4,6 +4,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
@@ -18,17 +19,12 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc RefServer
-func NewServer(
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	txManager transaction.Manager,
-	catfileCache catfile.Cache,
-) gitalypb.RefServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.RefServiceServer {
 	return &server{
-		txManager:     txManager,
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
+		txManager:     deps.GetTxManager(),
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
 	}
 }
 
diff --git a/internal/gitaly/service/ref/testhelper_test.go b/internal/gitaly/service/ref/testhelper_test.go
index a80dc7dcf..c64ff480a 100644
--- a/internal/gitaly/service/ref/testhelper_test.go
+++ b/internal/gitaly/service/ref/testhelper_test.go
@@ -46,31 +46,9 @@ func setupRefService(tb testing.TB) (config.Cfg, gitalypb.RefServiceClient) {
 
 func runRefServiceServer(tb testing.TB, cfg config.Cfg) string {
 	return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterRefServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterRefServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	})
 }
 
diff --git a/internal/gitaly/service/remote/server.go b/internal/gitaly/service/remote/server.go
index 1eb3dcf5d..ba2552537 100644
--- a/internal/gitaly/service/remote/server.go
+++ b/internal/gitaly/service/remote/server.go
@@ -4,6 +4,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client"
@@ -21,19 +22,13 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc RemoteServiceServer
-func NewServer(
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	catfileCache catfile.Cache,
-	txManager transaction.Manager,
-	connsPool *client.Pool,
-) gitalypb.RemoteServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.RemoteServiceServer {
 	return &server{
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		catfileCache:  catfileCache,
-		txManager:     txManager,
-		conns:         connsPool,
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		catfileCache:  deps.GetCatfileCache(),
+		txManager:     deps.GetTxManager(),
+		conns:         deps.GetConnsPool(),
 	}
 }
 
diff --git a/internal/gitaly/service/remote/testhelper_test.go b/internal/gitaly/service/remote/testhelper_test.go
index cf71f9860..75a1dc1dd 100644
--- a/internal/gitaly/service/remote/testhelper_test.go
+++ b/internal/gitaly/service/remote/testhelper_test.go
@@ -25,25 +25,8 @@ func setupRemoteService(t *testing.T, ctx context.Context, opts ...testserver.Gi
 	cfg := testcfg.Build(t)
 
 	addr := testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterRemoteServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetTxManager(),
-			deps.GetConnsPool(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterRemoteServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 	}, opts...)
 	cfg.SocketPath = addr
 
diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go
index fdf94702c..d926a50c8 100644
--- a/internal/gitaly/service/remote/update_remote_mirror_test.go
+++ b/internal/gitaly/service/remote/update_remote_mirror_test.go
@@ -568,30 +568,15 @@ func TestUpdateRemoteMirror(t *testing.T) {
 			cfg := testcfg.Build(t)
 
 			addr := testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
+				gitalypb.RegisterRepositoryServiceServer(srv, repositorysvc.NewServer(deps))
+
 				cmdFactory := deps.GetGitCmdFactory()
 				if tc.wrapCommandFactory != nil {
 					cmdFactory = tc.wrapCommandFactory(t, deps.GetGitCmdFactory())
 				}
+				deps.GitCmdFactory = cmdFactory
 
-				gitalypb.RegisterRemoteServiceServer(srv, NewServer(
-					deps.GetLocator(),
-					cmdFactory,
-					deps.GetCatfileCache(),
-					deps.GetTxManager(),
-					deps.GetConnsPool(),
-				))
-				gitalypb.RegisterRepositoryServiceServer(srv, repositorysvc.NewServer(
-					deps.GetCfg(),
-					deps.GetLocator(),
-					deps.GetTxManager(),
-					deps.GetGitCmdFactory(),
-					deps.GetCatfileCache(),
-					deps.GetConnsPool(),
-					deps.GetHousekeepingManager(),
-					deps.GetBackupSink(),
-					deps.GetBackupLocator(),
-					deps.GetRepositoryCounter(),
-				))
+				gitalypb.RegisterRemoteServiceServer(srv, NewServer(deps))
 			})
 			cfg.SocketPath = addr
 
diff --git a/internal/gitaly/service/repository/server.go b/internal/gitaly/service/repository/server.go
index 5a2df1fed..d87fc6b63 100644
--- a/internal/gitaly/service/repository/server.go
+++ b/internal/gitaly/service/repository/server.go
@@ -10,6 +10,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
@@ -37,30 +38,19 @@ type server struct {
 }
 
 // NewServer creates a new instance of a gRPC repo server
-func NewServer(
-	cfg config.Cfg,
-	locator storage.Locator,
-	txManager transaction.Manager,
-	gitCmdFactory git.CommandFactory,
-	catfileCache catfile.Cache,
-	connsPool *client.Pool,
-	housekeepingManager housekeeping.Manager,
-	backupSink backup.Sink,
-	backupLocator backup.Locator,
-	repositoryCounter *counter.RepositoryCounter,
-) gitalypb.RepositoryServiceServer {
+func NewServer(deps *service.Dependencies) gitalypb.RepositoryServiceServer {
 	return &server{
-		locator:             locator,
-		txManager:           txManager,
-		gitCmdFactory:       gitCmdFactory,
-		conns:               connsPool,
-		cfg:                 cfg,
-		loggingCfg:          cfg.Logging,
-		catfileCache:        catfileCache,
-		housekeepingManager: housekeepingManager,
-		backupSink:          backupSink,
-		backupLocator:       backupLocator,
-		repositoryCounter:   repositoryCounter,
+		locator:             deps.GetLocator(),
+		txManager:           deps.GetTxManager(),
+		gitCmdFactory:       deps.GetGitCmdFactory(),
+		conns:               deps.GetConnsPool(),
+		cfg:                 deps.GetCfg(),
+		loggingCfg:          deps.GetCfg().Logging,
+		catfileCache:        deps.GetCatfileCache(),
+		housekeepingManager: deps.GetHousekeepingManager(),
+		backupSink:          deps.GetBackupSink(),
+		backupLocator:       deps.GetBackupLocator(),
+		repositoryCounter:   deps.GetRepositoryCounter(),
 
 		licenseCache: newLicenseCache(),
 	}
diff --git a/internal/gitaly/service/repository/testhelper_test.go b/internal/gitaly/service/repository/testhelper_test.go
index ba57b32e7..39b618ce5 100644
--- a/internal/gitaly/service/repository/testhelper_test.go
+++ b/internal/gitaly/service/repository/testhelper_test.go
@@ -56,57 +56,13 @@ func newMuxedRepositoryClient(t *testing.T, ctx context.Context, cfg config.Cfg,
 
 func runRepositoryService(tb testing.TB, cfg config.Cfg, opts ...testserver.GitalyServerOpt) (gitalypb.RepositoryServiceClient, string) {
 	serverSocketPath := testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterRepositoryServiceServer(srv, NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRemoteServiceServer(srv, remote.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetTxManager(),
-			deps.GetConnsPool(),
-		))
-		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-		))
-		gitalypb.RegisterRefServiceServer(srv, ref.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(
-			deps.GetCfg(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-		))
-		gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetTxManager(),
-			deps.GetHousekeepingManager(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterRepositoryServiceServer(srv, NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
+		gitalypb.RegisterRemoteServiceServer(srv, remote.NewServer(deps))
+		gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(deps))
+		gitalypb.RegisterRefServiceServer(srv, ref.NewServer(deps))
+		gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(deps))
+		gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(deps))
 	}, opts...)
 
 	return newRepositoryClient(tb, cfg, serverSocketPath), serverSocketPath
diff --git a/internal/gitaly/service/server/info_test.go b/internal/gitaly/service/server/info_test.go
index 6d3179ebc..d265e87bd 100644
--- a/internal/gitaly/service/server/info_test.go
+++ b/internal/gitaly/service/server/info_test.go
@@ -71,7 +71,7 @@ func TestGitalyServerInfo(t *testing.T) {
 
 func runServer(t *testing.T, cfg config.Cfg, opts ...testserver.GitalyServerOpt) string {
 	return testserver.RunGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterServerServiceServer(srv, NewServer(deps.GetGitCmdFactory(), deps.GetCfg().Storages))
+		gitalypb.RegisterServerServiceServer(srv, NewServer(deps))
 	}, opts...)
 }
 
diff --git a/internal/gitaly/service/server/server.go b/internal/gitaly/service/server/server.go
index b4085f703..48b1a575c 100644
--- a/internal/gitaly/service/server/server.go
+++ b/internal/gitaly/service/server/server.go
@@ -3,6 +3,7 @@ package server
 import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
 
@@ -13,6 +14,9 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc ServerServiceServer
-func NewServer(gitCmdFactory git.CommandFactory, storages []config.Storage) gitalypb.ServerServiceServer {
-	return &server{gitCmdFactory: gitCmdFactory, storages: storages}
+func NewServer(deps *service.Dependencies) gitalypb.ServerServiceServer {
+	return &server{
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		storages:      deps.GetCfg().Storages,
+	}
 }
diff --git a/internal/gitaly/service/setup/register.go b/internal/gitaly/service/setup/register.go
index b14298f1a..56cc2083a 100644
--- a/internal/gitaly/service/setup/register.go
+++ b/internal/gitaly/service/setup/register.go
@@ -52,104 +52,26 @@ var (
 
 // RegisterAll will register all the known gRPC services on  the provided gRPC service instance.
 func RegisterAll(srv *grpc.Server, deps *service.Dependencies) {
-	gitalypb.RegisterBlobServiceServer(srv, blob.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-	))
-	gitalypb.RegisterCleanupServiceServer(srv, cleanup.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-	))
-	gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(
-		deps.GetCfg(),
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-	))
-	gitalypb.RegisterDiffServiceServer(srv, diff.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-	))
-	gitalypb.RegisterNamespaceServiceServer(srv, namespace.NewServer(deps.GetLocator()))
-	gitalypb.RegisterOperationServiceServer(srv, operations.NewServer(
-		deps.GetHookManager(),
-		deps.GetTxManager(),
-		deps.GetLocator(),
-		deps.GetConnsPool(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-		deps.GetUpdaterWithHooks(),
-		deps.GetCfg().Git.SigningKey,
-	))
-	gitalypb.RegisterRefServiceServer(srv, ref.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetTxManager(),
-		deps.GetCatfileCache(),
-	))
-	gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-		deps.GetCfg(),
-		deps.GetLocator(),
-		deps.GetTxManager(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-		deps.GetConnsPool(),
-		deps.GetHousekeepingManager(),
-		deps.GetBackupSink(),
-		deps.GetBackupLocator(),
-		deps.GetRepositoryCounter(),
-	))
-	gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetTxManager(),
+	gitalypb.RegisterBlobServiceServer(srv, blob.NewServer(deps))
+	gitalypb.RegisterCleanupServiceServer(srv, cleanup.NewServer(deps))
+	gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(deps))
+	gitalypb.RegisterDiffServiceServer(srv, diff.NewServer(deps))
+	gitalypb.RegisterNamespaceServiceServer(srv, namespace.NewServer(deps))
+	gitalypb.RegisterOperationServiceServer(srv, operations.NewServer(deps))
+	gitalypb.RegisterRefServiceServer(srv, ref.NewServer(deps))
+	gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+	gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(deps,
 		ssh.WithPackfileNegotiationMetrics(sshPackfileNegotiationMetrics),
 	))
-	gitalypb.RegisterSmartHTTPServiceServer(srv, smarthttp.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetTxManager(),
-		deps.GetDiskCache(),
+	gitalypb.RegisterSmartHTTPServiceServer(srv, smarthttp.NewServer(deps,
 		smarthttp.WithPackfileNegotiationMetrics(smarthttpPackfileNegotiationMetrics),
 	))
-	gitalypb.RegisterConflictsServiceServer(srv, conflicts.NewServer(
-		deps.GetHookManager(),
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-		deps.GetConnsPool(),
-		deps.GetUpdaterWithHooks(),
-	))
-	gitalypb.RegisterRemoteServiceServer(srv, remote.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-		deps.GetTxManager(),
-		deps.GetConnsPool(),
-	))
-	gitalypb.RegisterServerServiceServer(srv, server.NewServer(deps.GetGitCmdFactory(), deps.GetCfg().Storages))
-	gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetCatfileCache(),
-		deps.GetTxManager(),
-		deps.GetHousekeepingManager(),
-		deps.GetRepositoryCounter(),
-	))
-	gitalypb.RegisterHookServiceServer(srv, hook.NewServer(
-		deps.GetHookManager(),
-		deps.GetLocator(),
-		deps.GetGitCmdFactory(),
-		deps.GetPackObjectsCache(),
-		deps.GetPackObjectsLimiter(),
-	))
-	gitalypb.RegisterInternalGitalyServer(srv, internalgitaly.NewServer(
-		deps.GetCfg().Storages,
-		deps.GetLocator(),
-	))
+	gitalypb.RegisterConflictsServiceServer(srv, conflicts.NewServer(deps))
+	gitalypb.RegisterRemoteServiceServer(srv, remote.NewServer(deps))
+	gitalypb.RegisterServerServiceServer(srv, server.NewServer(deps))
+	gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(deps))
+	gitalypb.RegisterHookServiceServer(srv, hook.NewServer(deps))
+	gitalypb.RegisterInternalGitalyServer(srv, internalgitaly.NewServer(deps))
 
 	healthpb.RegisterHealthServer(srv, health.NewServer())
 	reflection.Register(srv)
diff --git a/internal/gitaly/service/smarthttp/server.go b/internal/gitaly/service/smarthttp/server.go
index c0733ae28..c58167abb 100644
--- a/internal/gitaly/service/smarthttp/server.go
+++ b/internal/gitaly/service/smarthttp/server.go
@@ -2,8 +2,8 @@ package smarthttp
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/cache"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
@@ -19,22 +19,16 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc SmartHTTPServer
-func NewServer(
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	txManager transaction.Manager,
-	cache cache.Streamer,
-	serverOpts ...ServerOpt,
-) gitalypb.SmartHTTPServiceServer {
+func NewServer(deps *service.Dependencies, serverOpts ...ServerOpt) gitalypb.SmartHTTPServiceServer {
 	s := &server{
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		txManager:     txManager,
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		txManager:     deps.GetTxManager(),
 		packfileNegotiationMetrics: prometheus.NewCounterVec(
 			prometheus.CounterOpts{},
 			[]string{"git_negotiation_feature"},
 		),
-		infoRefCache: newInfoRefCache(cache),
+		infoRefCache: newInfoRefCache(deps.GetDiskCache()),
 	}
 
 	for _, serverOpt := range serverOpts {
diff --git a/internal/gitaly/service/smarthttp/testhelper_test.go b/internal/gitaly/service/smarthttp/testhelper_test.go
index e765b020e..c9487106d 100644
--- a/internal/gitaly/service/smarthttp/testhelper_test.go
+++ b/internal/gitaly/service/smarthttp/testhelper_test.go
@@ -26,40 +26,10 @@ func TestMain(m *testing.M) {
 
 func startSmartHTTPServerWithOptions(t *testing.T, cfg config.Cfg, opts []ServerOpt, serverOpts []testserver.GitalyServerOpt) testserver.GitalyServer {
 	return testserver.StartGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterSmartHTTPServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			deps.GetDiskCache(),
-			opts...,
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetTxManager(),
-			deps.GetHousekeepingManager(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
+		gitalypb.RegisterSmartHTTPServiceServer(srv, NewServer(deps, opts...))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+		gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(deps))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
 	}, serverOpts...)
 }
 
diff --git a/internal/gitaly/service/ssh/server.go b/internal/gitaly/service/ssh/server.go
index fd978704b..c0dd3513a 100644
--- a/internal/gitaly/service/ssh/server.go
+++ b/internal/gitaly/service/ssh/server.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
@@ -27,16 +28,11 @@ type server struct {
 }
 
 // NewServer creates a new instance of a grpc SSHServer
-func NewServer(
-	locator storage.Locator,
-	gitCmdFactory git.CommandFactory,
-	txManager transaction.Manager,
-	serverOpts ...ServerOpt,
-) gitalypb.SSHServiceServer {
+func NewServer(deps *service.Dependencies, serverOpts ...ServerOpt) gitalypb.SSHServiceServer {
 	s := &server{
-		locator:       locator,
-		gitCmdFactory: gitCmdFactory,
-		txManager:     txManager,
+		locator:       deps.GetLocator(),
+		gitCmdFactory: deps.GetGitCmdFactory(),
+		txManager:     deps.GetTxManager(),
 		uploadPackRequestTimeoutTickerFactory: func() helper.Ticker {
 			return helper.NewTimerTicker(defaultUploadPackRequestTimeout)
 		},
diff --git a/internal/gitaly/service/ssh/testhelper_test.go b/internal/gitaly/service/ssh/testhelper_test.go
index 0d93a5e9f..eb3b5fe40 100644
--- a/internal/gitaly/service/ssh/testhelper_test.go
+++ b/internal/gitaly/service/ssh/testhelper_test.go
@@ -30,38 +30,10 @@ func runSSHServerWithOptions(t *testing.T, cfg config.Cfg, opts []ServerOpt, ser
 
 func startSSHServerWithOptions(t *testing.T, cfg config.Cfg, opts []ServerOpt, serverOpts ...testserver.GitalyServerOpt) testserver.GitalyServer {
 	return testserver.StartGitalyServer(t, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
-		gitalypb.RegisterSSHServiceServer(srv, NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetTxManager(),
-			opts...))
-		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(
-			deps.GetHookManager(),
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetPackObjectsCache(),
-			deps.GetPackObjectsLimiter(),
-		))
-		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-			cfg,
-			deps.GetLocator(),
-			deps.GetTxManager(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetConnsPool(),
-			deps.GetHousekeepingManager(),
-			deps.GetBackupSink(),
-			deps.GetBackupLocator(),
-			deps.GetRepositoryCounter(),
-		))
-		gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(
-			deps.GetLocator(),
-			deps.GetGitCmdFactory(),
-			deps.GetCatfileCache(),
-			deps.GetTxManager(),
-			deps.GetHousekeepingManager(),
-			deps.GetRepositoryCounter(),
-		))
+		gitalypb.RegisterSSHServiceServer(srv, NewServer(deps, opts...))
+		gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps))
+		gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
+		gitalypb.RegisterObjectPoolServiceServer(srv, objectpool.NewServer(deps))
 	}, serverOpts...)
 }
 
diff --git a/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go b/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go
index c7c2c88c2..15895b7ba 100644
--- a/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go
+++ b/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go
@@ -11,6 +11,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
@@ -49,12 +50,12 @@ func createNewServer(t *testing.T, cfg config.Cfg, logger log.Logger) *grpc.Serv
 	catfileCache := catfile.NewCache(cfg)
 	t.Cleanup(catfileCache.Stop)
 
-	gitalypb.RegisterRefServiceServer(server, ref.NewServer(
-		config.NewLocator(cfg),
-		gitCommandFactory,
-		transaction.NewManager(cfg, backchannel.NewRegistry()),
-		catfileCache,
-	))
+	gitalypb.RegisterRefServiceServer(server, ref.NewServer(&service.Dependencies{
+		StorageLocator:     config.NewLocator(cfg),
+		GitCmdFactory:      gitCommandFactory,
+		TransactionManager: transaction.NewManager(cfg, backchannel.NewRegistry()),
+		CatfileCache:       catfileCache,
+	}))
 
 	return server
 }
diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go
index 72cd6ce27..f2d37af59 100644
--- a/internal/praefect/info_service_test.go
+++ b/internal/praefect/info_service_test.go
@@ -36,18 +36,7 @@ func TestInfoService_RepositoryReplicas(t *testing.T) {
 		cfg := testcfg.Build(t, testcfg.WithStorages(storage))
 		cfgs = append(cfgs, cfg)
 		cfgs[i].SocketPath = testserver.RunGitalyServer(t, cfgs[i], func(srv *grpc.Server, deps *service.Dependencies) {
-			gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(
-				deps.GetCfg(),
-				deps.GetLocator(),
-				deps.GetTxManager(),
-				deps.GetGitCmdFactory(),
-				deps.GetCatfileCache(),
-				deps.GetConnsPool(),
-				deps.GetHousekeepingManager(),
-				deps.GetBackupSink(),
-				deps.GetBackupLocator(),
-				deps.GetRepositoryCounter(),
-			))
+			gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps))
 		}, testserver.WithDisablePraefect())
 		cfgNodes = append(cfgNodes, &config.Node{
 			Storage: cfgs[i].Storages[0].Name,
diff --git a/internal/praefect/verifier_test.go b/internal/praefect/verifier_test.go
index d3945a9b6..bea23c51f 100644
--- a/internal/praefect/verifier_test.go
+++ b/internal/praefect/verifier_test.go
@@ -475,18 +475,9 @@ func TestVerifier(t *testing.T) {
 				registerFunc := setup.RegisterAll
 				if tc.erroringGitalys[storageName] {
 					registerFunc = func(srv *grpc.Server, deps *service.Dependencies) {
-						gitalypb.RegisterRepositoryServiceServer(srv, erroringRepositoryService{repository.NewServer(
-							deps.GetCfg(),
-							deps.GetLocator(),
-							deps.GetTxManager(),
-							deps.GetGitCmdFactory(),
-							deps.GetCatfileCache(),
-							deps.GetConnsPool(),
-							deps.GetHousekeepingManager(),
-							deps.GetBackupSink(),
-							deps.GetBackupLocator(),
-							deps.GetRepositoryCounter(),
-						)})
+						gitalypb.RegisterRepositoryServiceServer(srv, erroringRepositoryService{
+							repository.NewServer(deps),
+						})
 					}
 				}