diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go
index 5a17edf5e66c3dd5e501709bf4168f2ce5942836..a25e87c9e6e1d4b69ec004fa86d468ad94e2bacb 100644
--- a/internal/cli/gitaly/serve.go
+++ b/internal/cli/gitaly/serve.go
@@ -39,7 +39,6 @@ import (
 	nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/snapshot"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
@@ -410,13 +409,11 @@ func run(appCtx *cli.Context, cfg config.Cfg, logger log.Logger) error {
 			storagemgr.NewFactory(
 				logger,
 				dbMgr,
-				migration.NewFactory(
-					partition.NewFactory(
-						gitCmdFactory,
-						localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache),
-						partitionMetrics,
-						logConsumer,
-					),
+				partition.NewFactory(
+					gitCmdFactory,
+					localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache),
+					partitionMetrics,
+					logConsumer,
 				),
 				2,
 				storageMetrics,
@@ -458,13 +455,11 @@ func run(appCtx *cli.Context, cfg config.Cfg, logger log.Logger) error {
 				storagemgr.NewFactory(
 					logger,
 					dbMgr,
-					migration.NewFactory(
-						partition.NewFactory(
-							gitCmdFactory,
-							localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache),
-							partitionMetrics,
-							nil,
-						),
+					partition.NewFactory(
+						gitCmdFactory,
+						localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache),
+						partitionMetrics,
+						nil,
 					),
 					// In recovery mode we don't want to keep inactive partitions active. The cache
 					// however can't be disabled so simply set it to one.
diff --git a/internal/cli/gitaly/subcmd_recovery.go b/internal/cli/gitaly/subcmd_recovery.go
index ba71551c2189c241e663459d66213310d8910b13..b348e9ba5b0cfe4abcd5b49fbb07dba280840190 100644
--- a/internal/cli/gitaly/subcmd_recovery.go
+++ b/internal/cli/gitaly/subcmd_recovery.go
@@ -22,7 +22,6 @@ import (
 	nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/snapshot"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/log"
@@ -123,13 +122,11 @@ func recoveryStatusAction(ctx *cli.Context) (returnErr error) {
 		storagemgr.NewFactory(
 			logger,
 			dbMgr,
-			migration.NewFactory(
-				partition.NewFactory(
-					gitCmdFactory,
-					localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache),
-					partitionMetrics,
-					nil,
-				),
+			partition.NewFactory(
+				gitCmdFactory,
+				localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache),
+				partitionMetrics,
+				nil,
 			),
 			1,
 			storageMetrics,
diff --git a/internal/gitaly/storage/storagemgr/partition/migration/factory.go b/internal/gitaly/storage/storagemgr/partition/migration/factory.go
deleted file mode 100644
index eed0e3ca0b5beafa7feeced9c5dad2eca9c865ae..0000000000000000000000000000000000000000
--- a/internal/gitaly/storage/storagemgr/partition/migration/factory.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package migration
-
-import (
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/log"
-)
-
-// migrationFactory defines a partition factory that wraps another partition factory.
-type migrationFactory struct {
-	factory storagemgr.PartitionFactory
-}
-
-// NewFactory returns a new Factory.
-func NewFactory(factory storagemgr.PartitionFactory) storagemgr.PartitionFactory {
-	return &migrationFactory{factory: factory}
-}
-
-// New returns a new Partition instance.
-func (f migrationFactory) New(
-	logger log.Logger,
-	partitionID storage.PartitionID,
-	db keyvalue.Transactioner,
-	storageName string,
-	storagePath string,
-	absoluteStateDir string,
-	stagingDir string,
-) storagemgr.Partition {
-	partition := f.factory.New(logger, partitionID, db, storageName, storagePath, absoluteStateDir, stagingDir)
-	return NewPartition(partition, logger)
-}
diff --git a/internal/gitaly/storage/storagemgr/partition/migration/manager.go b/internal/gitaly/storage/storagemgr/partition/migration/manager.go
index 2fe1e8c92d70083b401bfc15c9d1ce4752ecafef..5724a595e42ce74cbe43bfe806154a5cc035fc6e 100644
--- a/internal/gitaly/storage/storagemgr/partition/migration/manager.go
+++ b/internal/gitaly/storage/storagemgr/partition/migration/manager.go
@@ -38,16 +38,6 @@ type migrationManager struct {
 	migrationStates map[string]*migrationState
 }
 
-// NewPartition creates a migration manager that wraps the provided partition.
-func NewPartition(partition storagemgr.Partition, logger log.Logger) storagemgr.Partition {
-	return &migrationManager{
-		Partition:       partition,
-		logger:          logger,
-		migrations:      migrations,
-		migrationStates: map[string]*migrationState{},
-	}
-}
-
 func (m *migrationManager) Begin(ctx context.Context, opts storage.BeginOptions) (storage.Transaction, error) {
 	if err := m.migrate(ctx, opts.RelativePaths); err != nil {
 		return nil, fmt.Errorf("migrate: %w", err)
diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go
index 62ab00ae20a0e9260a175db1ab30f848b962ae04..66f7964e7adb2c65c78bbd22d797258eabb20e85 100644
--- a/internal/testhelper/testserver/gitaly.go
+++ b/internal/testhelper/testserver/gitaly.go
@@ -32,7 +32,6 @@ import (
 	nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/snapshot"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
@@ -355,16 +354,14 @@ func (gsd *gitalyServerDeps) createDependencies(tb testing.TB, ctx context.Conte
 			storagemgr.NewFactory(
 				gsd.logger,
 				dbMgr,
-				migration.NewFactory(
-					partition.NewFactory(
-						gsd.gitCmdFactory,
-						localrepo.NewFactory(gsd.logger, gsd.locator, gsd.gitCmdFactory, gsd.catfileCache),
-						partition.NewMetrics(
-							housekeeping.NewMetrics(cfg.Prometheus),
-							snapshot.NewMetrics(),
-						),
-						nil,
+				partition.NewFactory(
+					gsd.gitCmdFactory,
+					localrepo.NewFactory(gsd.logger, gsd.locator, gsd.gitCmdFactory, gsd.catfileCache),
+					partition.NewMetrics(
+						housekeeping.NewMetrics(cfg.Prometheus),
+						snapshot.NewMetrics(),
 					),
+					nil,
 				),
 				storagemgr.DefaultMaxInactivePartitions,
 				storagemgr.NewMetrics(cfg.Prometheus),